t
Merge branch 'develop' of https://github.com/jotaemepereira/PIS-GR4-2014.git into develop
Merge branch 'develop' of
https://github.com/jotaemepereira/PIS-GR4-2014.git into develop

Conflicts:
	sources/Prototipos/Java/DUSA/solr/home/articulos/conf/dataimport.properties
	sources/Prototipos/Java/DUSA/src/persistencia/PFacturacionControlador.java