Merge branch development-issue-4-android-service into dev

Merge development-issue-4-android-service into dev.