fixed a few labels
more filtering
Merge branch 'fix-labels' of https://github.com/JuhaniImberg/mooc-master-race into JuhaniImberg-fix-labels

Conflicts:
	app/views/applicants/index.html.haml