Merge branch 'origin/gh-pages'
Merge branch 'origin/develop'
Update nav_extended.md
Update nav_extended.md
ignore autodocs and node_modules
Merge branch 'origin/develop'

Conflicts:
	.gitignore
Merge branch 'develop' into gh-page
Merge remote-tracking branch 'origin/develop' into gh-pages
Merge branch 'origin/develop'
Merge branch 'origin/gh-pages'
standalone demo
hls fix demo
Merge branch 'origin/develop'

Conflicts:
	demo/demoApp/index.html
Merge branch 'origin/gh-pages'
rename videos to real