- Made changes
Merge branch 'MongoDB' of https://github.com/zxc1984/shoppingpal into MongoDB

Conflicts:
	public/js/controllers.js
	views/partials/expenseDetails.jade
	views/partials/expenseFriends.jade