Toggle buttons for filter
Merge branch 'master' into filters

Conflicts:
	app/views/partials/main.html
Merge pull request #42 from tcb-hr/filters

Toggle buttons for filter