Merge pull request #2 from mceledm/master

Commit general
Merge pull request #3 from mceledm/master

segundo merge
commit
commit 13-11-2014 16:15
commit 13-11-2014 16:15
commit 13-11-2014
commit 13-11-2014
commit 13-11-2014
Añadiendo archivos
commit 14-11-2014
stylE mENU
Merge branch 'master' of https://github.com/cmasanett/PHP_RRHH

Conflicts:
	config/autoload/.gitignore
stylE mENU 12:.07
Style Menu degrade  12:.07 V2
Style Menu degrade  12:.07 V2
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