commit 13-11-2014 16:15
commit 13-11-2014 16:15
commit 13-11-2014 17:16
commit
commit nuevas funciones + actualizacion
commit add
Merge branch 'master' of https://github.com/cmasanett/PHP_RRHH

Conflicts:
	module/Application/config/module.config.php
	module/Application/view/application/menu/index.phtml
	public/css/dashboard.css
	public/js/bootstrap.js