Can't add product already in order. Fixed money display
Fixed Collisions
Merge branch 'master' of https://github.com/planemaniac/brunton

Conflicts:
	app/scripts/directives/bottomMenu.js