add home link
Merge remote-tracking branch 'upstream/release-1' into release-1
fix notice merge conflict
Remove filler text
Merge and delete plain html files
updates
Add mandrill keys
Add host param for email
change from in registration mailer
Merge remote-tracking branch 'upstream/release-1' into release-1
Merge branch 'master' into release-1
updated tooltips
added comments to submissions/show and participant/profile pages
Merge remote-tracking branch 'upstream/release-1' into comments

Conflicts:
	app/views/submissions/index.html.slim
	app/views/submissions/new.html.slim
	app/views/submissions/show.html.slim
Add dropbox settings
Merge gemfile conflicts
Merge remote-tracking branch 'upstream/release-1'
comment out validations, dropbox settings
Remove unused models
Remove an old merge conflict