Added a filter spinner
Merge branch 'master' into ui-login-screen
Basic RecyclerView
More card stuff.
Merge branch 'master' into ui-login-screen

Conflicts:
	magiccardwall/app/src/main/res/layout/card_history.xml
Merge branch 'master' into ui-login-screen

Conflicts:
	magiccardwall/app/src/main/java/nz/co/trademe/fedex5/magiccardwall/activity/test/HistoryTestActivity.java
UI updates
Merge branch 'ui-login-screen'
Final UI changes