Merged a broken branch.

I guess I have some problem in my develop-eggs that links on rest_framework.

@andre.anjos @samuel.gaist

Could you please fix this and let me know what are the steps I need to do.