tvc
Merge branch 'develop' of github.com:MrNiceMrGood/PhotoMap into develop

Conflicts:
	.DS_Store
	PhotoMap/AppDelegate.m
	PhotoMap/Base.lproj/Main.storyboard
	PhotoMap/LogInVC.m