kleinere Änderung
Merge branch 'master' of https://github.com/Seko90/WinDelivery2014

Conflicts:
	log/development.log