Stable version of Server.

Still needs admin webpages.
Merge pull request #8 from tatwater/Tony

Stable version of Server.