add json registrations
add stage column
add stage controller to users
fix conflicts
Merge branch 'master' of https://github.com/hermanos/email into authenticate
add stage set and get