add collection to right navigation
rspec for CpsController
Merge branch 'master' of github.com:dwroth/TeaTracker
changed @farms.all.each to @farms.each