local junk
Merge branch 'master' of github.com:tadl/tadlmobile-android
back and forth we can now go