Added Nicks sounds to the app, added methods to invoke the sound in the test activity
Added colors for cards, and added type property to history response class
Merge branch 'master' into ui-login-screen

Conflicts:
	magiccardwall/app/src/main/java/nz/co/trademe/fedex5/magiccardwall/activity/test/HistoryTestActivity.java