Creacion de controller para Nomina.
Merge https://github.com/ACGM/acsystem

Conflicts:
	acgm/static/css/estilos.css
	acgm/templates/base.html
	db.sqlite3
Update requirements.txt
Diseño de pantalla de nomina en un 85%
Merge https://github.com/ACGM/acsystem
Merge https://github.com/ACGM/acsystem

Conflicts:
	acgm/urls.pyc
	cuenta/models.pyc
	cuenta/views.pyc
	cxp/models.pyc
	db.sqlite3