added terms of service page; added submit visual page; removed get involved page
added mailer forms for send data and submit visual; updated contact form to match format of new mailer forms
moved contact view to root
fixed encoding error for file attachment; changed locale key name for email subject; trying to send email from user
changed contact and notifications to use feradi email address
switching to feradi.info domain
missed a setting
reseting back to jumpstart.ge
switching back to feradi
added text for send data and submit visual
setting up production deploy
forgot to chagne staging to production
found another spot where forgot to change staging to production
fixed error in migration file; removed email from contact page
upgraded to rails 3.1.10; added new fields to admin org form
fixed param id name
Merge branch 'master' of github.com:JumpStartGeorgia/Visualizing-News
updated frozen-menu styles. returned to the old resp width styles. updated markup for wrapper & footer in order to keep the footer at the bottom
Merge branch 'master' into ajax-viz

Conflicts:
	app/controllers/root_controller.rb
completed ajax stuff