finished filtering fronted
Merged 'dev'.

Conflicts:
	app/js/bootstrap/app.js
Finish message_filter