further built out User views and controllers
fixed merge conflicts
fixed small migration problem
fixing more merge conflicts
Merge pull request #27 from Cynaria/controllers_views_sprint_2

Controllers views sprint 2