Getting rid of hybrid view bug
Merge remote-tracking branch 'origin/Hybridfix' into refactor

Conflicts:
	HexTCGDeckBuilder/src/com/ozawa/hextcgdeckbuilder/UI/customdeck/CustomDeckFragment.java