friday in-office changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	cache-api/src/main/java/org/test/pof/MyInvocable1.java
	cache/cache.iml
	cache/src/main/resources/META-INF/gar-cache-config.xml
	client-app/src/main/java/org/test/client/ClientApp.java
iml's
hate, hate, hate all
added ManagerVO+Manager entity