UI changes
Merge branch 'master' of https://github.com/guts2014/TEAM-NAME-PHP

Conflicts:
	source/customer.coffee