unitOfMeasure
Merge branch 'MongoDB' of https://github.com/zxc1984/shoppingpal into MongoDB

Conflicts:
	app.js