change return type json
Merge branch 'master' of https://github.com/suhan1021/3213Team12

Conflicts:
	coincide/coincide/views.py