Merge remote-tracking branch 'mgaitan/models' into models

Conflicts:
	escrutiniosocial/escrutiniosocial/settings.py
	requirements.txt
Merge remote-tracking branch 'upstream/master' into models
Merge remote-tracking branch 'origin/api' into models

Conflicts:
	escrutiniosocial/escrutiniosocial/settings.py
	requirements.txt
API v1, vinculada a todos los modelos existentes