Merge branch 'design' into staging

Conflicts:
	Gemfile.lock
	app/.DS_Store
	app/assets/.DS_Store
	app/assets/javascripts/backbone/.DS_Store
	app/assets/javascripts/backbone/apps/.DS_Store
	db/schema.rb
	db/seeds.rb
fix confs