sillyness
Merge branch 'master' of https://github.com/stealthycoin/TMAndorid
all location stuff at once
adventure time for dialogs
[login_dialog] remembered to stage the XML files too YAY
Woops...gotta make sure the cancel dialog button works
Merge branch 'master' of https://github.com/stealthycoin/TMAndorid
CrapperMapperUser.java merge fix
Merge pull request #106 from stealthycoin/login_dialogs

Login dialogs