Modifications User Controller, User routing, User Views, Security
Merge branch 'vince_develop' into develop