Ansatz Auto Completion
Merge branch 'dev' into editor-functions

Conflicts:
	app/static/js/editor.js