Clean up.
Merge branch 'develop' of https://github.com/ericpinet/musicputt into develop

Conflicts:
	MusicPutt.xcodeproj/project.xcworkspace/xcshareddata/MusicPutt.xccheckout