Merge pull request #319 from VirtualFlyBrain/master

Bringing up to date
Merge pull request #323 from VirtualFlyBrain/master

Correcting to working set
Merge pull request #326 from VirtualFlyBrain/Dev-Server

Fix for ont server restart
Merge pull request #327 from VirtualFlyBrain/Dev-Server

Bringing up to date
Updating with latest version from DOS
Merge pull request #329 from VirtualFlyBrain/Sandbox-Server

Updating OWL from DOS's Sandbox server
Merge pull request #330 from VirtualFlyBrain/master

Bringing up to date