Merge remote-tracking branch 'upstream/develop' into develop
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