first domain classes - part2
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/main/java/com/gadgroup/online/core/model/InventoryUpdate.java
	core/src/main/java/com/gadgroup/online/core/model/ShopProduct.java