Support video embedding
Merge branch 'master' of https://github.com/wolfgangmm/AtomicWiki

Conflicts:
	resources/scripts/atomic/html-editor.js