Merge branch 'Marco' of https://github.com/AppVentureHK/MyClothingApp into Marco

Conflicts:
	Android/MyClothingApp/src/com/appventure/myclothingapp/data/ClothingManager.java
Merge branch 'Marco' of https://github.com/AppVentureHK/MyClothingApp into Marco

Conflicts:
	Android/MyClothingApp/src/com/appventure/myclothingapp/widget/DesignerImageView2.java
DesignerImageView