upated base controller and worked on basic uuser index for testing
missed these two guys
merged master with dev and resolved conflict