took out unnecessary js that was causing errors
Merge branch 'staging'