style tweaks
Merge branch 'master' of https://github.com/bgun/sharepay

Conflicts:
	public/app/models/CartModel.js