Updated server address in pom.xml to reflect no longer needing port
Merge remote-tracking branch 'origin/master'