messaging 17a works, 17b still in progress
Merge branch 'master' of https://github.com/camo1018/GTMRS

Conflicts:
	public/js/figure2.js