feat: filter markers on click category.
Add test to the category selection.
Merge branch 'master' into 174+172

Conflicts:
	client/app/index.html
	client/app/scripts/app.js
	client/app/scripts/controllers/dashboard.js
	client/app/scripts/services/utils.js
Fix after merge