changed location
Merge branch 'untested' of https://github.com/dreanor/androidwebapp.git into untested