fix order bug
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/styles/main.css