Misc
Merge branch 'master' of https://github.com/johnmccutchan/asset_pack
Fix json and path breakages