Use directives to filter data
Merge remote-tracking branch 'origin/master'

Conflicts:
	partials/editview.html
	static/js/app.js
	static/js/controllers/EditController.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	partials/editview.html
	static/js/app.js
	static/js/controllers/EditController.js