Updated Project Settings
Merge branch 'develop'

Conflicts:
	JOECategories.xcodeproj/project.pbxproj
Merge branch 'develop'
Updated documentation script.
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'release/0.2.0'
Updated programming guide.markdown