refactor
optional editing line
Merge branch 'master' of github.com:antoniopuero/uwc

Conflicts:
	public/js/app/views/CreateOrderView.coffee
Merge branch 'master' of github.com:antoniopuero/uwc

Conflicts:
	public/js/app/views/OrderView.coffee