Merge pull request #14 from jankroken/dev

various changes
not sure if i commited this earlier locationblock
finished off locationblock, added addX() and addY() methods to location
added troop class, few misc changes
httpservlet for a basic ui
simple untested socket client framework