integration of fontstash
Merge branch 'master' of github.com:vrx/ofxvrx

Conflicts:

esonoplayer/esonoplayer.xcodeproj/project.xcworkspace/xcuserdata/vrx.xcu
serdatad/UserInterfaceState.xcuserstate