Admin users form and views
Question & QuestionOption (WIP)
Evaluations introduction
Narrow layout. Evaluation answers (WIP)
Mailer & payments (WIP)
F**** Merge branch 'master' of https://github.com/olimart/qe

Conflicts:
Gemfile
app/controllers/evaluations_controller.rb
app/controllers/payments_controller.rb
app/models/evaluation.rb
app/models/payment.rb
app/models/user.rb
app/views/admin/evaluations/index.html.erb
app/views/admin/payments/index.html.erb
app/views/admin/users/_user.html.erb
app/views/application/_header.html.erb
app/views/evaluations/start.html.erb
config/locales/en.yml
config/routes.rb
db/migrate/20140403041509_create_evaluations.rb
db/migrate/20140405232415_create_payments.rb
db/sample_data.rb
db/schema.rb
F**** Merge branch 'master' of https://github.com/olimart/qe

Conflicts:
	Gemfile
	app/controllers/evaluations_controller.rb
	app/controllers/payments_controller.rb
	app/models/evaluation.rb
	app/models/payment.rb
	app/models/user.rb
	app/views/admin/evaluations/index.html.erb
	app/views/admin/payments/index.html.erb
	app/views/admin/users/_user.html.erb
	app/views/application/_header.html.erb
	app/views/evaluations/start.html.erb
	config/locales/en.yml
	config/routes.rb
	db/migrate/20140403041509_create_evaluations.rb
	db/migrate/20140405232415_create_payments.rb
	db/sample_data.rb
	db/schema.rb