Switched build to ant
Some client/server work
Merge remote-tracking branch 'origin/master'