Version 1.1
Merge branch 'master' of github.com:teleportR/android-app