merge maser
fix liqubase
fix merge conflicts
add test management
add localization in admin page
pull master
merge with master
changes in userTestStatistic.jsp, add test for TestStatistic  Dao and Service, add javadocs
Merge branch 'master' into vetall1
fix null pointer on active courses
change design testInfo