ie fix
Merge branch 'master' into web_app
base64 for ie
Merge branch 'master' into web_app