both youtube and html are visible
Merge branch 'master' into dev

Conflicts:
	content/modules/dev/files.js
fix typo
Merge branch 'master' into dev
Merge branch 'master' into dev
Merge branch 'master' into dev
Merge branch 'master' into dev
Merge branch 'master' into dev
Merge branch 'dev' into import-annotation
Merge branch 'import-annotation' of https://github.com/nbproject/nbproject into import-annotation
Cleaned up treeview names