Some GeoObject spec/view tests neutralized.
Merge remote-tracking branch 'origin/master'

Conflicts:
	spec/lib/housekeeping_spec.rb