--Refactor api code a bit..
Merge branch 'coco_final' of github.com:digitalgreenorg/dg into coco_final

Conflicts:
	dashboard/api.py