Merge branch 'master' of https://github.com/streetlinemedia/base

Conflicts:
	html/js/plugins/baseScroll.js
Resolve conflicts