Removed conflicts
Login API included
source updated
Login API included
Added session. WIP
Merge branch 'master' into apiwrapper

Conflicts:
	PhotoChatv2/PhotoChat.xcodeproj/project.pbxproj