Conflicts fixed
Merge branch 'master' of https://github.com/MagneticHamster/KnowledgeIsland
Only 6 errors left