Merge branch 'master' of https://github.com/TDiva/WTH-SmartWardrobe

Conflicts:
	SmartWardrobe/src/by/SmartWardrobe/AddingActivity.java
	SmartWardrobe/src/main/wardrobe/entity/Apparel.java