Add user controller with tests.
Fix file indentation.
Merge branch '1018_user_controller' into develop