filters moved

Conflicts:
	app/scripts/controllers/main.js