Agregada Django App para API de Escrutinio Social
Merge remote-tracking branch 'upstream/master' into api
Agregado TastyPie a requerimientos
Resuelto conflicto con requirements.txt (requests iba a versión 1.1.0 cuando estaba en 2.x)
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 'upstream/master' into api

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

Conflicts:
	escrutiniosocial/escrutiniosocial/settings.py
	requirements.txt
API v1, vinculada a todos los modelos existentes
Fixed conflictos de requirements
Fixed nessita typo
Dropeo de requirements que estaban de más (culpa de un vagrant)
Decoupling del API router. Ahora tiene su propio urls.py
Merge remote-tracking branch 'upstream/master' into api

Conflicts:
	escrutiniosocial/core/admin.py
	escrutiniosocial/escrutiniosocial/settings.py
	requirements.txt
Fixed typo en models.py
Merge pull request #9 from joelalejandro/api

Agregada Django App para API de Escrutinio Social