update
update code
Merge branch 'master' into develop

Conflicts:
	docs/dist/stylesheets/exakat_sass.css
update