server project clean up
Merge branch 'master' of github.com:guts2014/alpha