ODM mapping updates + adjust collection
Merge branch 'refactor' of git://github.com/vespolina/VespolinaProduct into refactor

Conflicts:
	lib/Vespolina/Product/Mapping/BaseProduct.mongodb.xml
	lib/Vespolina/Product/Mapping/Product.mongodb.xml