Stand nach Treffen am 17.01.2014
Merge branch 'master' of
https://github.com/korffo/UniHH-NoSQLWS13-14.git

Conflicts:
	Onlineshop/app/controllers/ProductController.java
	Onlineshop/app/models/Bestellung.java
	Onlineshop/app/models/DBConnecting.java
	Onlineshop/app/models/Kunde.java
	Onlineshop/app/models/OShopEntity.java
	Onlineshop/app/models/Position.java
	Onlineshop/app/models/Produktkatalog.java
	Onlineshop/app/models/Startup.java
	Onlineshop/app/models/Warenkorb.java
	Onlineshop/app/models/database/DBConnecting.java
	Onlineshop/app/models/entities/Artikel.java
	Onlineshop/app/models/entities/Bestellung.java
	Onlineshop/app/models/entities/Kunde.java
	Onlineshop/app/models/entities/KundenKonto.java
	Onlineshop/app/models/entities/Position.java
	Onlineshop/app/models/entities/Produktkatalog.java
	Onlineshop/app/models/entities/Retouren.java
	Onlineshop/app/models/entities/Warenkorb.java