Merge branch 'gh-pages'
Merge branch 'feature/custom-directives' into develop
Merge branch 'develop'
Merge pull request #1 from raymonschouwenaar/master

Merge gh-pages