Merge remote-tracking branch 'origin/framework'

Conflicts:
	.gitignore
implement 2nd-lvl cache for hibernate
implements spring-aop
apply spring-aop mecanism