Started devel branch, feature development done. Server development is fo...

...r bug fixes only from this commit onwards.

Removed unnecessary time-outs in test.