Merge pull request #62 from palaa159/develop

fix scrolling for 1+ students
New db
Merge branch 'develop' of https://github.com/mattfelsen/mfadt-thesis-website-2014 into develop
Merge remote-tracking branch 'upstream/develop' into develop

merge
fix a bunch