crossdomain req fix
Merge branch 'master' into torque
Merge branch 'torque' into torquew