Merge branch 'hotfix/update-magnific-popup' into develop
Merge branch 'master' into develop
Document and add configurable navigation links to Jekyll _config.yml
Merge branch 'develop' into gh-pages