Add some changes
Merge branch 'master' of github.com:codersparks/elite-data

Conflicts:
	src/main/java/org/codersparks/elite/controller/CommodityRestController.java