Make JSON interfaces more standardized

Uniform naming scheme
Merge branch 'master' of https://github.com/alexweissman/UserFrosting

Conflicts:
	load_current_user.php