removed SolarCollector model
Merge branch 'Annex60' of github.com:open-ideas/IDEAS into Annex60