Collection Points added, not yet displayed/sorted in farms
Merge branch 'master' of github.com:dwroth/TeaTracker