Changed default font, added fonts and related licenses, fixed messy merge, commented out some tests.
Merge remote-tracking branch 'origin/sandbox'