update
Merge branch 'master' of
https://github.com/korffo/UniHH-NoSQLWS13-14.git

Conflicts:
	Onlineshop/app/models/entities/Artikel.java
	Onlineshop/app/views/productDetails.scala.html