some work on new feature
done
Merge branch 'new-feature'

Conflicts:
	js/demo.js