update
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controller/Orders.js
	app/view/order/Detail.js
	app/view/order/DetailList.js
add login