Merge branch 'release/0.0.4'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'gh-pages'
fix confilc
Merge branch 'gh-pages'
update code
Merge branch 'master' into develop

Conflicts:
	docs/dist/stylesheets/exakat_sass.css