Removed empty line in makefile... annoying
Merge branch 'development' of github.com:mbrenn/datenmeister into development

Conflicts:
	makefile