update
Merge branch 'master' of https://github.com/nygeog/msm

Conflicts:
	scripts/.DS_Store