I always have a lot of changes. more updates
Merge branch 'MongoDB' of https://github.com/zxc1984/shoppingpal into MongoDB

Conflicts:
	public/js/app.js
	public/js/controllers.js
	views/partials/expenseSummary.jade
	views/partials/shopping.jade
added back some changes that could not be merged