arreglando para bootstrap 3:inestable...
documento
Merge origin/master

Conflicts:
	src/main/webapp/js/main.js
	src/main/webapp/jsp/usuario/login01.jsp