Merge branch 'master'

Conflicts:
	hybrid/battery.py
	hybrid/csp_source.py
	hybrid/detailed_pv_plant.py
	hybrid/financial/custom_financial_model.py
	hybrid/power_source.py