updated css and app template files
Merge branch 'master' of https://github.com/vanstyn/BlueBox

Conflicts:
	mockup/ORDER/index.html
Merge branch 'master' of https://github.com/vanstyn/BlueBox