Database interaction working from client-side
Merge remote-tracking branch 'origin/master'

Conflicts:
	editor.js