test
restfulMerge branch 'master' of https://github.com/in-the-keyhole/khs-sherpa
Merge branch 'master' of https://github.com/in-the-keyhole/khs-sherpa.git
[maven-release-plugin] prepare release khs-sherpa-1.1.4
[maven-release-plugin] prepare for next development iteration
updated readme with restful URL mapping
Merge branch 'master' of https://github.com/in-the-keyhole/khs-sherpa
Merge branch 'master' of https://github.com/in-the-keyhole/khs-sherpa
comment added
Merge branch 'master' of https://github.com/in-the-keyhole/khs-sherpa
Update README.md
test jenkins service hook
add Get and Push methods
Merge remote-tracking branch 'origin/master'
[maven-release-plugin] prepare release khs-sherpa-1.1.5
[maven-release-plugin] prepare for next development iteration
add test <scope> to test dependencies
Merge pull request #7 from lukewpatterson/master

correct <scope> of test dependencies
Merge remote-tracking branch 'origin/1.2.0'

Conflicts:
	pom.xml
	src/main/java/com/khs/sherpa/servlet/SherpaServlet.java
	src/test/java/com/khs/example/endpoint/EndpointScanTest.java
update readme