commit
Merge branch 'master' of https://github.com/zoza/cache-manager-guice.git

Conflicts:
	src/test/java/aop/TestAop.java
	src/test/java/aop/TestClass.java