new
Merge branch 'master' of https://github.com/instribution/instribution

Conflicts:
	IS.xcodeproj/project.xcworkspace/xcshareddata/IS.xccheckout
jhorn