working on userscontroller
Merge branch 'master' of https://github.com/Groarq/tablica into moonrise
common hours
Merge branch 'master' of https://github.com/Groarq/tablica