Testing controllers. Wiki controller tests half passing.
Merge branches 'master' and 'create-users-controller'