34
Merge branch 'master' of https://github.com/hogaggid/framework

Conflicts:
	framework/framework-container/pom.xml
	framework/framework-repository/pom.xml
	framework/pom.xml