.
Merge pull request #144 from michalikm/dev

.
.
Merge pull request #145 from michalikm/dev

.
.
Merge pull request #146 from michalikm/dev

.
tests
wip
Merge pull request #147 from Rafiki5/dev4

tests
Merge pull request #148 from hiradkruk/dev

Facutly: index table fixed
Faculty: Minor changes
Merge branch 'master' into dev