Deploy scripts, rubyracer and changed order in index
Removed .orig file
Merge branch 'master' into dropmenu

Conflicts:
	app/assets/stylesheets/application.css.scss
Merge branch 'dropmenu'