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
Update README.md
Merge branch 'origin/develop'
Merge branch 'origin/gh-pages'
Update README.md
philips start wrapper with headers
standalone demo
hls fix demo
Update README_EN.md
Update README_EN.md
Merge branch 'origin/master'
Merge branch 'origin/develop'

Conflicts:
	README.md
	README_EN.md
Merge remote-tracking branch 'origin/master' into develop