removed our enum
Merge branch 'master' of https://github.com/CodingBliss/WhiteElephant

Conflicts:
	model/Product.java
	model/ProductGroup.java
	model/ProductNode.java