Removed extra locs
Clarified javadocs
Updated to 1.1.4
Updated to 1.1.5
Updated to new 1.1.5
Fixed typo
Merge branch 'master' of git://github.com/battlecode/battlecode-server