Started incorporating json into the users_controller#1

axtheset wants to merge 2 commits intomasteraxtheset/open-todo:masterfrom

developmentaxtheset/open-todo:developmentCopy head branch name to clipboard