gestion user y admin
Merge remote-tracking branch 'origin/master'

Conflicts:
	TrabajoIT/src/java/strut/VehiculoActionForm.java
	TrabajoIT/web/WEB-INF/userview.jsp