added keyword type
Merge branch 'master' of https://github.com/agilo-boards/agilo-boards

Conflicts:
	client/app/scripts/config.js
Added filter modal to filter by keyword type