Initial commit of oxygen restyle
Major overhaul of participant screen
Adds inactive note to participant
Merge branch 'can' into oxygen-restyle

Conflicts:
	public/stylesheets/style.css
Fixes conflict from merge
Merges in changes from master
Adds contact info section to participant screen
Adds retina version of the DreamSIS logo
Adds retina favicon
Merge branch 'matt-develop' into oxygen-restyle
bump
Merges in changes from master plus other enhancements
Merge branch 'master' into oxygen-restyle

Conflicts:
	app/controllers/event_attendances_controller.rb
	app/controllers/participants_controller.rb
	app/models/people/participant.rb
	app/models/person_fafsa.rb
	app/models/reports/report.rb
	app/views/object_filters/index.html.erb
	app/views/participants/_details.rhtml
	app/views/participants/_filter_results.html.erb
	app/views/participants/_notes.html.erb
	app/views/participants/index.xls.erb
	app/views/participants/show.html.erb
	app/views/participants/update.js.rjs
	app/views/scholarships/applications.xls.erb
	app/views/scholarships/index.xls.erb
	config/routes.rb
	db/schema.rb
	public/stylesheets/style.css
Upgrade to rails 3.1.2 and jQuery

Major changes application-wide to upgrade to rails 3.1.2. Old config
files marked “.rails2”. Still work in progress.
Continuing upgrade to 3.1.2
Additional rails 3 updates
Adds ey.yml and database changes for staging
Updating gemfile
Updating mysql2 gem version based on EY
ey