Merge branch 'develop' into Documentation
Almost finished documentation
Merge branch 'Documentation' into develop