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
problem behoben und counter in pcatBucket gespeichert.
Merge branch 'master' of https://github.com/korffo/UniHH-NoSQLWS13-14.git
Merge branch 'master' of
https://github.com/korffo/UniHH-NoSQLWS13-14.git

Conflicts:
	Onlineshop/app/controllers/CategoryViewController.java
	Onlineshop/app/controllers/utils/DBCleaner.java
	Onlineshop/app/models/database/DBConnecting.java