test
from master
Merge from master
fix bug with wrong pagination params
fix gitignore
from master
Add sort for search result
Change search panel
add join for schedulers, rewrite sort
Resolve bugs with search
sort in search
search sort v2
fix merge
Subjects with schedulers, some small changes in search
merge
View on search
fix merge
add icons for sort, add admin buttons for index
add dbunit test and fix some student pages