fix categories and masks not saving.
Merge branch 'develop' of https://github.com/apportable/SpriteBuilder into develop
Merge pull request #434 from jtwigg/develop

fix categories and masks not saving.
Updates Cocos2D
The Cocos2D change that you cannot live without
Android code reinstated.
Refactoring: Naming convention for src and dst file paths.
Refactoring: Removed code duplication and obsolete html5 code.
Logging for publishing can be toggled now in PublishLogging.h.
Cancelling publishing will disable the cancelling button and change the title to "Cancelling...".
Ivar publishedResources removed since it was only used for HTML5 publishing.
Logging for operations moved to super classes method main.
Ivar publishedSpriteSheetNames removed.
It's only used to mark already created previews. Solved in PublishSpriteSheetOperation class internally.
Description of helper methods and a bugfix.
Described class method.
Removed debug logging.
Refactoring: Moved some lines of code to make grouping clearer.
Merge branch 'develop' into feature/#352_abort_publishing