correction
Merge branch 'master' of https://github.com/ramajan/dbdesk
itest commit
Conflicts:
	configs/settings.py
	models/language.py
	templates/components/query_form.html
	templates/components/toppanel.html
	templates/dbman_admin.html
Merge branch 'master' of https://github.com/ramajan/dbdesk
correction
Conflicts:
	templates/components/toppanel.html
	templates/dbman_admin.html