Fixing path when running simulation from command line.
SW-85. Fix in SW.
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop_SW-1b
SW-1. General improvements to web page implementation.

Preparing for pull request.