bugfixing
Merge branch 'master' of https://github.com/dreanor/androidwebapp.git