Merge branch 'master' into david

Conflicts:
	bwf_site/static/js/listbox.js