building seasons spec for grass-programmers
Merge branch 'master' of https://github.com/steveoro/goggles

Conflicts:
	app/models/season.rb
	spec/factories/seasons.rb
	spec/models/season_spec.rb