Merge remote-tracking branch 'origin/comentor'
fixed: Violating Content Security Policy directive via uninstall npm
Merge remote-tracking branch 'origin/comentor'
Merge branch 'master' of https://github.com/deadwookie/karaul
add links to navbar
some dev
fix "index" link
Merge branch 'master' of https://github.com/deadwookie/karaul
Added: Base rule markup
dev
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/templates/application.hbs
Support firebase for logs
add some swag to templates
re-indent to tabs
firebase url moved to config
emails and logs
task+skill+skillCategory
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/adapters/application.js
	app/router.js
email and logs improvements
fixed: task model relations