test
Merge branch 'master' of https://github.com/rfcx/rfcx-client-android
Merge branch 'master' of https://github.com/rfcx/rfcx-client-android
maps working on api 8
fix merge and separate method for media player