Documentation updated
Merge branch 'develop' into feature/javascript_debug

* develop:
  Documentation updated