bugzid 3684: fixed server architecture
Merge pull request #57 from daniellemayne/develop

bugzid 3684: fixed server architecture - develop