new database
.
Merge branch 'master' of https://github.com/flaket/ostbar

Conflicts:
	server/public/js/elementInteraction.js