Disabled FPS meter, it was ugly
Merge branch 'dev' of https://github.com/verath/ESCP into dev
Merge branch 'dev' of https://github.com/verath/ESCP into dev