moving to mongodb
json fix
temporary fix for colors not working
fixed mongo bugs
fixed conflicts
Merge remote-tracking branch 'origin/json_backend_fix'

Conflicts:
	models.py
Merge remote-tracking branch 'origin/master' into add-backbone