upgraded pepole view
conflict fix
Merge branch 'master' of https://github.com/Groarq/tablica into acceptuser
conflict
conflict
tables upgrades #2
table upgrades #3
edit users by admin
better font
Merge branch 'layout'
just improving git configuration
Merge branch 'master' of https://github.com/Groarq/tablica into moonrise
Resolved conflicts and fixed syntax errors in HolidayController
Merge branch 'master' of https://github.com/Groarq/tablica
Resolved conflicts and fixed syntax errors in HolidayController
Merge branch 'master' of https://github.com/Groarq/tablica into moonrise
unaccepted user authentication