Ivan
Merge develop

Conflicts:
	web/index3.xml
Merge origin/master into jona

Conflicts:
	nbproject/genfiles.properties
	web/META-INF/context.xml
	web/WEB-INF/web.xml
	web/empleado/app.js
	web/empleado/index.html
	web/empleado/main/main-route.js
Merge origin/master into jona

Conflicts:
	nbproject/genfiles.properties
	web/META-INF/context.xml
	web/WEB-INF/web.xml
	web/empleado/app.js
	web/empleado/index.html
	web/empleado/main/main-route.js
Merge origin/master into jona

Conflicts:
	nbproject/genfiles.properties
	web/META-INF/context.xml
	web/WEB-INF/web.xml
	web/empleado/app.js
	web/empleado/index.html
	web/empleado/main/main-route.js