new feature
Merge branch 'develop'

Conflicts:
	TestGitFlow/Base.lproj/Main_iPhone.storyboard