use local dbapi that we can control
Merge branch 'develop' of github.com:Zucka/girafAdmin into develop

Conflicts:
	source/desktop/db/new.db.php