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

Conflicts:
	Android/MyClothingApp/src/com/appventure/myclothingapp/ClothingItemDetailActivity.java
	Android/MyClothingApp/src/com/appventure/myclothingapp/MyCollectionActivity.java
	Android/MyClothingApp/src/com/appventure/myclothingapp/OutfitDetailActivity.java
	Android/MyClothingApp/src/com/appventure/myclothingapp/widget/AlertDialogFragment.java
	Android/MyClothingAppTestTest/.classpath
Merge branch 'Marco' of https://github.com/AppVentureHK/MyClothingApp into Marco