Fixed scroll/slider issues with back to top button
Merge branch 'master' of https://github.com/sameetandpotatoes/EnergySolutions

Conflicts:
	app/assets/javascripts/scroll.coffee