Changed things in user controller and view
Merge branch 'master' of https://github.com/Groarq/tablica
Fixed some problems