spring framework
Merge branch 'master' of git@github.com:soluvas/soluvas-framework.git

Conflicts:
	pom.xml
FREQ-31 #resolve Upgrade EMF to 2.9.0