_
Merge remote-tracking branch 'origin/master'

Conflicts:
	MoCo Server/src/de/htw/toto/moco/server/database/DBBackend.java
name changed