Added json helper for view functions
Added json helper for view functions
Merge branch 'master' of https://github.com/noahgoldman/textlink

Conflicts:
	server/textlink/views.py