* .WOFF file loading should work now instead of 404
* Merge