order create
Merge branch 'master' of https://github.com/eliu03/WelHair

Conflicts:
	src/www/frontend/apps/modules/ajax/views/scripts/order/form.ajax.phtml
	src/www/static/js/frontend/main.js