As you know by now, Marvel and Sony have struck an agreement that will bring Spider-Man into the Marvel cinematic universe. Many details were left out of the announcement, but more information is spilling out here and there.
The announcement states, "The new Spider-Man will first appear in a Marvel film from Marvel's Cinematic Universe," but it doesn't say which film. This is where The Wall Street Journal has stepped in with a new report confirming a Spidey appearance in Captain America 3:
http://comicbook.com/2015/02/10/spider-man-to-appear-in-captain-america-civil-war-sinister-six-d/
But...Sony still keeps the web-head rights, but will also work with Marvel. This deal may see other Marvel hero's guest starring in Spidey movies, as well.