Update CategoryAdapter.java and SeasonAdapter.java
Merge branch 'Marco' of https://github.com/AppVentureHK/MyClothingApp into Marco

Conflicts:
	Android/MyClothingApp/res/layout/fgmt_outfit.xml
Outfit