Merge branch 'master' into rails4

Conflicts:
	.ruby-version
	app/models/group.rb
	app/models/question.rb
	app/views/answer_form/_bool.html.erb
	app/views/districts/index.html.erb
	app/views/districts/show.html.erb
	app/views/groups/_list.html.erb
	app/views/groups/show.html.erb
	app/views/questions/_form.html.erb
	app/views/schools/_list.html.erb
	app/views/schools/show.html.erb