order
Merge branch 'master' of github.com:lifang/lantan_BAM
update order
Conflicts:
	app/models/complaint.rb
	config/routes.rb