Before merge with alex's pull request
Merge generally successful

moving on to making  expose jquery plugin
Bug fixes and enhancements after merge
Fixing reorders, sliders and adding module views
pre-browserify latest
Added browserify and css fixes.
Merge branch 'adding-browserify' into develop

Conflicts:
	css/style.css
	dist/bundle.css
	dist/bundle.js
	scripts/bundle.js