#30 Update cxf to 2.7.8, spring to 4.0.0.RELEASE, aspectj to 1.7.4
Merge remote-tracking branch 'hibernarm-service/master'

Conflicts:
	pom.xml