adding base64 support to AssetLoader
fix conflicts