Merge pull request #1157 from steverichey/dev

Embed sound assets, except HTML5
Improved the behaviour of FlxText#font, #1152

- now correctly initialized with FlxAssets.FONT_DEFAULT instead of null
- now supports fonts that were not embedded via openfl.Assets
- text.font = null now sets it back to the default font
Update CHANGELOG.md
fix merge conflict