Merge branch 'master' into EditProfile
Created form on user edit page
First form view for edit page
Merge branch 'master' into EditProfile
Merge branch 'EditProfile'