Android and iOS checkboxes visible in project settings again.
Choose publish dir: Creating directories in the dialog can be quite handy.
Refactor: Using different IBActions to distinguish between the different publish dir select buttons.
Using tags to identify elements is brittle.
File previews contain Android settings again.
Publishing for Android working. Some weirdness with the android sound format fixed.
God I hate NSPopUpButtons.
Allow Non-Square PNGs
Merge pull request #637 from NickyWeber/feature/#501_refactoring_resource_actions

Feature/#501 refactoring resource actions
Merge pull request #629 from djh-/develop

Allow Non-Square PNG Smart Sprite Sheet Export
Merge pull request #643 from NickyWeber/feature/#501_3_package_folder

Feature/#501 3 package folder
Merge pull request #528 from NickyWeber/feature/add_android_publishing

Feature/add android publishing
Enable Non-Square Sprite Sheets

Resize width and height alternatively while packing images into
non-square sprite sheets
Merge pull request #648 from djh-/develop

Improve Texture Packing for Non-Square Sprite Sheets
Merge branch 'develop' into feature/#501_4_migration

Conflicts:
	SpriteBuilder/ccBuilder/ProjectSettingsWindow.xib
	SpriteBuilder/ccBuilder/ProjectSettingsWindowController.m
Fixed project settings tests.
Refactoring: Removed commented code.
Migration: Move file command added.
FileCommands interface added.
FileMoveCommand refaactored.
Removed properties, not need.
Adjusted tests.
CreateDirectoryCommand added.
FileCommands used to apply file changes and create a stack of commands.
Removed resource paths from project tracked as well.