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

Conflicts:
	Onlineshop/app/models/database/DBConnecting.java