BugFixes #2
Merge branch 'master' of https://github.com/Thiner-LES/pomt-android-app