add grunt and first test task
add watch task for coffeescript
added target/ and *.iml
added *.log
added project/
Merged 'dev'.

Conflicts:
	.gitignore
	Gruntfile.js
	app/js/bootstrap/app.js
	package.json
resolved merge conflict
zwischenstand
Merged 'dev'.

Conflicts:
	app/css/app.css
added karma targets to grunt
Finish build-process
conf files moved to archive
added bootstrap
Merge remote-tracking branch 'origin/dev' into dev
Merged 'dev'.