Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #6 from brdoco/develop

Add debugging support for development and test environments via debugger...
Merge branch 'develop' of https://github.com/tmecklem/shipmate into develop
Updating the apps controller to handle android directories
Make changes to app listing to support android.
Updating existing iOS code to handle the update api that accepts a dir and app name.
Major refactor to create independent app builds for android and iOS.
Merge pull request #7 from bb44wsu/develop

Major refactor for Android Support
Removing duplication
Duplicate and unexecuted code
Adding tests for import_apps and shared duplicated code
Moving the platform (iOS, android) import code into a strategies that can be registered with the importer
Merge remote-tracking branch 'upstream/develop' into develop
Fixed issue where iOS apps were getting listed as both iOS apps and Android apps. #bugfix