This merge fixes #45

Conflicts:
	app/js/Router.js
	app/js/filter/filter-overview-view.js
	app/templates/comment-view.html
	test/specs/router-spec.js