fixing
Merge branch 'rails4' of https://github.com/pwz2k/date into rails4

Conflicts:
	app/models/question.rb
	db/schema.rb
	db/sphinx/development/user_core.spa
	db/sphinx/development/user_core.spd
	db/sphinx/development/user_core.sph
	db/sphinx/development/user_core.spi
	db/sphinx/development/user_core.sps
	log/development.sphinx.pid