Limit to tufts
Changes for Tufts
Merge branch 'tufts' into develop

* tufts:
  Changes for Tufts
  Limit to tufts

Conflicts:
	html_app/master_model.js
.DS_Store probably should be ignored
Merge branch 'release/V20130603'
Merge branch 'master' of starapp.mit.edu:StarCellBio
Merge branch 'master' of github.com:starteam/StarCellBio