Merge branch 'master' of https://github.com/metapolator/metapolator

Conflicts:
	static/js/editor.js