merging android stuff with webstuff
mostly the same as other repo
Merge branch 'master' of https://github.com/tadl/tadlmobile-web