[All] Cleanup
[WebServer] Cleanup
Merge pull request #43 from mono-soc-2013/master

[All] Cleanup