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
Merge pull request #8 from brdoco/develop

Don't list iOS apps as Android pas