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

Conflicts:
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6