updated Profile
Merge branch 'Parse-User'
Merge branch 'Profile-Page'

Conflicts:
	SidebarDemo/SidebarDemo.xcodeproj/project.pbxproj
	SidebarDemo/SidebarDemo/ProfileViewController.m
	SidebarDemo/SidebarDemo/en.lproj/MainStoryboard.storyboard
Merge branch 'master' of https://github.com/ssniteman/GG-iOS