zahl ziehen
Merge branch 'zaki3' into development

Conflicts:
	lib/MysqlAdapter.php