product relation ship
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/mum/store/domain/Product.java