Merge branch 'develop' of github.com:jetchegaray/tallerDesarrolloProyectos1 into develop
dashboard1
dashboard2
dashboard2
Merge branch 'develop' of github.com:jetchegaray/tallerDesarrolloProyectos1 into develop
Merge branch 'master' into feature/contrataciones

Conflicts:
	app/controllers/UserController.java
	conf/routes
tabla dinamica.. falta terminar de linkear mongo y estilos.. falta conversacion
Archivos Faltantes del Dashboard
Merge branch 'develop' of github.com:jetchegaray/tallerDesarrolloProyectos1 into develop
Borro Archivos Temporales
algunas cosas de proveedores
Merge branch 'master' into feature/contrataciones
Merge branch 'master' into feature/contrataciones

Conflicts:
	app/model/domain/Task.java
	app/views/main.scala.html
Fix hiring style
subo mensajes
Merge branch 'feature/contrataciones' of github.com:jetchegaray/tallerDesarrolloProyectos1 into feature/contrataciones
agrego linkeo de novedades a la base
Merge branch 'develop' of github.com:jetchegaray/tallerDesarrolloProyectos1 into develop
More temporary files
Merge branch 'develop' of github.com:jetchegaray/tallerDesarrolloProyectos1 into develop