Merge branch 'develop'

Conflicts:
	JOECategories.xcodeproj/project.pbxproj