remove useless code
update karma version
test fugitive
Merge branch 'master' into dev

Conflicts:
	Makefile
	package.json