Merge branch 'develop' into feature/#501_packages_step_one

Conflicts:
	SpriteBuilder/SpriteBuilder.xcodeproj/project.pbxproj
	SpriteBuilder/ccBuilder/AppDelegate.m
	SpriteBuilder/ccBuilder/SnapLayerKeys.h
	SpriteBuilder/ccBuilder/SnapLayerKeys.m
Merge branch 'feature/#501_packages_step_one' of https://github.com/NickyWeber/SpriteBuilder into feature/#501_packages_step_one