Merge remote-tracking branch 'upstream/umass_branch' into umass_branch
Working on Interaction merging newest code
Added interactions stages.  Fixed Migrations
Merge remote-tracking branch 'upstream/umass_branch' into umass_branch

Conflicts:
	app/assets/javascripts/application.js
added some stuff for john
fixing merge conflicts