various
delflag
Merge remote-tracking branch 'origin/tobiX' into development

Conflicts:
	lib/MysqlAdapter.php
endlich fertig!!!