Added more edit profile stuff
Merge branch 'master' of https://github.com/RichFell/ShutterShare

Conflicts:
	ProfileViewController.m