Produktanzeige
Stand nach Treffen am 09.05.2014
Merge remote-tracking branch 'origin/master'

Conflicts:
	Onlineshop/app/controllers/ApplicationController.java
	Onlineshop/app/models/entities/Kunde.java
	Onlineshop/app/views/korb.scala.html
	Onlineshop/conf/routes