SASS_WATCH will turn on and off 'sass --watch' with ./dev-start.sh

set SASS_WATCH=1 to enable sass --watch to watch for changes in
/sass and compile them into /public/css/
Merge branch 'upstream/master' - add SASS_WATCH

Conflicts:
	start.sh