Init import
Merge branch 'master' of github.com:tjchaplin/angularKarma

Conflicts:
	app/index.html
	app/scripts/directives/additembutton.js
	app/views/main.html
	gruntfile.js
	test/spec/services/tooltypeservice.js