Merge branch 'master' of https://github.com/smamol/magiccardwall_android
Merge branch 'master' of https://github.com/smamol/magiccardwall_android
Added avatar url to the history data
Added picasso to the project
Merge branch 'ui-login-screen'

Conflicts:
	magiccardwall/app/src/main/java/nz/co/trademe/fedex5/magiccardwall/activity/HistoryActivity.java
Whoops...
Added username to the history item class
Added history card for card view
Merge branch 'master' into ui-login-screen
Basic RecyclerView