Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
miscellaneous fixes
add EEM font
Merge branch 'dev'
delete old code
add LICENSE
Merge old code