added some tests + better error messages
zwischenstand
Merged 'dev'.

Conflicts:
	Gruntfile.js