order
Merge branch 'master' of github.com:lifang/lantan_BAM

Conflicts:
	app/models/order.rb

update order
Merge branch 'master' of github.com:lifang/lantan_BAM

update order