Adding some user forms and changes in user controllers
Merge branch 'master' of https://github.com/Luisbo85/Avengers