Merge pull request #5 from bb44wsu/develop

Adding in apk importer and renaming some ios stuff
Merge remote-tracking branch 'upstream/develop' into develop