Merge branch '317-update_apk_naming' into 'master'

Update app naming scheme

See merge request !102
1 job for master in 3 minutes and 21 seconds (queued for 2 seconds)