Merge pull request #124 from MartyBurns/master

sync with OpenESPI-Common-java/etc
added saved token store configuration with localhost port 8080
rename for port properly