sammi leave
sammi leave
Merge remote-tracking branch 'origin/master'

Conflicts:
	data_model/data/client_js_config.json
	static/common/common.js
sammi leave
Merge remote-tracking branch 'origin/master'