order view working
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/js/interceptors.js
small design changes
small design changes
Merge remote-tracking branch 'origin/master'