Nightly checkin: Updates for unit tests
Fix server to work with stand alone unit tests
Merge pull request #29 from jrconlin/qa_test

Fixes for QA testing