finish some model test
Merge branch 'master' of github.com:billy3321/cic-website

Conflicts:
	app/models/question.rb
	spec/models/ad_session_spec.rb
	spec/models/ad_spec.rb
	spec/models/election_spec.rb