removed our enum
Merge branch 'master' of https://github.com/CodingBliss/test-src

Conflicts:
	model/ItemTest.java
	model/ProductContainerTest.java
	model/ProductTest.java