Merge branch 'master' into raysmond
updated user registration and form helper
Merge branch 'raysmond'