ultimo commit
add users controllers, set up named routes
Merge branch 'master' into sp-layout