got rid of stupid hardcoded stuff
close login window when other function completes
Merge branch 'master' of github.com:tadl/tadlmobile-android