Se eliminan print y se mejora el manejo de excepciones
Merge branch 'develop' of
https://github.com/jotaemepereira/PIS-GR4-2014.git into develop

Conflicts:
	sources/Prototipos/Java/DUSA/src/controladores/StockControlador.java
	sources/Prototipos/Java/DUSA/src/persistencia/PStockControlador.java
Merge branch 'develop' of
https://github.com/jotaemepereira/PIS-GR4-2014.git into develop

Conflicts:
	sources/Prototipos/Java/DUSA/src/beans/ModificarStockBean.java
Merge branch 'develop' of
https://github.com/jotaemepereira/PIS-GR4-2014.git into develop

Conflicts:
	sources/Prototipos/Java/DUSA/src/beans/ModificarStockBean.java
Conexion
Merge branch 'develop' of https://github.com/jotaemepereira/PIS-GR4-2014.git into develop
Mensajes en espaniol
Merge branch 'develop' into verificacion