-Dan-
-Dan-
-Dan-
-Dan-
Merge remote-tracking branch 'origin/master'

Conflicts:
	SmartWardrobe/src/main/wardrobe/entity/Apparel.java
-Dan-
-Dan-
-Dan-
Merge branch 'master' of https://github.com/TDiva/WTH-SmartWardrobe
-Dan-
Merge remote-tracking branch 'origin/master'