Removed tabs and reordered client/server files.
Merge branch 'master' of github.com:nalply/SemaCMS