Session bugfix
jsp includes
Merge branch 'master' of https://github.com/szaza/academicinfo into HEAD