Start of filter UI
Adding filter buttons for all colours with correct image
Merge branch 'development' into FilterUI

Conflicts:
	Ozawa/App/src/main/java/com/ozawa/android/ImageAdapter.java
	Ozawa/App/src/main/java/com/ozawa/android/MasterDeckActivity.java
Merge branch 'development' into FilterUI
Making drawer transparent