Added login functionality to test activity
Added jackson converter
Hooked up login api to the login ui
Cache the token to shared preferences
Hooked up the FAB button to the qr code reader
Implemented shake detection to undo the last move (no ui)
Toasts weren't showing properly
Removed all my test code now that sam's ui code has been integrated
Removed all my test code now that sam's ui code has been integrated
Merge branch 'master' of https://github.com/smamol/magiccardwall_android
Shake dialog.
Merge branch 'master' into ui-login-screen

Conflicts:
	magiccardwall/app/app.iml
	magiccardwall/app/src/main/java/nz/co/trademe/fedex5/magiccardwall/fragment/HistoryFragment.java