Add user and listing controllers
Merge branch 'thomas'