Veränderung von kleinen Sachen
Änderung
große Veränderung
Merge branch 'master' of https://github.com/Seko90/WinDelivery2014

Conflicts:
	app/views/order/index.html.erb
	tmp/cache/assets/development/sprockets/04b0242754ce78a8b24c755155abe46f
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/development/sprockets/765133a993719673ce2836affd3cc917
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/development/sprockets/f8c5f7d309cbe06c6a9dcfc1e29b7237