Fix makefile to work with gh-pages
Merge branch 'hotfix-make-gh-pages' into develop
Merge remote-tracking branch 'origin/develop' into develop