Merge branch 'gh-pages' into develop
+ no new window
+ header adjusted
Merge branch 'develop' into gh-pages