shitty local stuff
merge
Merge branch 'master' of github.com:tadl/tadlmobile-android
getting up to date