add some specs to model and controller
specs added
fixed factories.rb
fixed spec_helper.rb
Merge remote-tracking branch 'upstream/at0422'

Conflicts:
	Gemfile.lock