home work
Merge branch 'master' of https://github.com/YKiselev/WlsCoherence

Conflicts:
	cache/src/main/resources/META-INF/gar-cache-config.xml
	client-app/src/main/resources/my-cache-config.xml
added iml