avance login
avance login
avance login
Merge origin/master

Conflicts:
	Tornado-ejb/src/test/java/edu/unal/service/UserServiceTest.java
	Tornado-web/faces-config.NavData
	Tornado-web/src/main/webapp/WEB-INF/faces-config.xml
Merge origin/master

Conflicts:
	Tornado-ejb/src/test/java/edu/unal/service/UserServiceTest.java
	Tornado-web/faces-config.NavData
	Tornado-web/src/main/webapp/WEB-INF/faces-config.xml