cocoapdos, Facebook and parse.com integration
Merge branch 'master' of https://github.com/iOSTeam-J-R-R-Tolkien/PhotoTravel

Conflicts:
	PhotoTravel.iOSClient/PhotoTravel.xcodeproj/project.pbxproj
	PhotoTravel.iOSClient/PhotoTravel/AppDelegate.m
	PhotoTravel.iOSClient/PhotoTravel/LoginViewController.h
	PhotoTravel.iOSClient/PhotoTravel/LoginViewController.m