conflikte beseitigt
test
Merge remote-tracking branch 'origin/master'

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