Merge branch 'master' into jboss

Conflicts:
	solaria-project/pom.xml
Merge branch 'master' of github.com:pedrodonte/biblioteca-solaria
Se homologa toda la funcionalidad para JBoss as 7