Update db with server info
Merge branch 'develop' of github.com:Zucka/girafAdmin into develop

Conflicts:
	source/desktop/db/db.php