changed url
changed matcher
Merge origin/master

Conflicts:
	src/main/resources/demoapp.properties