Removing actionscript
Merge branch 'master' into cleanupActi