cambios que quedaron pendientes de subir ayer
Merge branch 'develop' of https://github.com/jotaemepereira/PIS-GR4-2014 into develop

Conflicts:
	sources/Prototipos/Java/DUSA/WebContent/login.xhtml
	sources/Prototipos/Java/DUSA/src/beans/LoginBean.java
	sources/Prototipos/Java/DUSA/src/beans/StockBean.java
	sources/Prototipos/Java/DUSA/src/controladores/SistemaControlador.java
	sources/Prototipos/Java/DUSA/src/interfaces/ISistema.java
Merge branch 'develop' of https://github.com/jotaemepereira/PIS-GR4-2014 into develop