Edited documentation of the project
Merge branch 'feature-basis-doc' into dev
Merge branch 'dev'