fix search according to route framework
Merge branch 'dev' of https://github.com/snwfog/peerpen into dev

Conflicts:
	src/main/resources/config/resource.yml