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

Conflicts:
	app/assets/javascripts/application.js
fixing merge conflict
added some stuff for john
adding files forgotten in merge
fixing merge conflicts
moved the javascript out of application.js and moved it into a citations.js. For easier reading. Also fixed how the authors are displayed after adding them to the array.
got feedback plugin to display however load does not load new feedback.
now the feed back form displays after clicking on the feed back link
mailer~