Stash local versions
and css
Merge branch 'local'

Conflicts:
	css/style.css
	js/dscourse.js