bugzid 3684: fixed server architecture
Merge pull request #56 from daniellemayne/2013.07

bugzid 3684: fixed server architecture - 2013.07