Updated Main.js, and base hero files
Merge branch 'origin/master'