Merge branch 'master' into dev
Debugged wind and PV and made future debuggins easier
Bugfixes with shapefile layouts
Version 1.0.1

Bugfix release