Respaldo antes de paso a jboss as 7
Merge branch 'master' into jboss

Conflicts:
	solaria-project/pom.xml