ws example

ws example
ws example

ws example
ws example

ws example
Merge remote-tracking branch 'origin/master'

Conflicts:
	jm-web/src/main/webapp/WEB-INF/spring/root-context.xml