fontstuff
Merge branch 'master' into Oskar
Exception handling started
removed unused imports
fixed merge conflicts