lis for merge
Merge branch 'andres.dev' of https://github.com/VetHeroes/vetcrm

Conflicts:
	config/bootstrap.js
merge
Merge branch 'andres.dev' of https://github.com/VetHeroes/vetcrm into brayan.dev

Conflicts:
	config/bootstrap.js
csrf descomentado
Merge branch 'andres.dev' of https://github.com/VetHeroes/vetcrm into brayan.dev
Merge branch 'andres.dev' of https://github.com/VetHeroes/vetcrm into brayan.dev
Merge branch 'andres.dev' of https://github.com/VetHeroes/vetcrm into brayan.dev
* Ajustes de convenciones
* Implementación del modelo para el sistema de usuarios y permisos
Ajustes varios de convención
postman import
email with template and mandrill-api module
csrf enabled
minor update
ACL policy
Ajustes de modelos
Merge branch 'brayan.dev' of https://github.com/VetHeroes/vetcrm
Schemas