FPS indicator and minor fix
Asset loader and minor fix
Merge remote-tracking branch 'origin/master' into gh-pages