Fix some problems of the current version
Merge branch 'master' of https://github.com/JanLuca/UMEduWiki