SOLAR AND BATTERY STORAGE TO DOMINATE 2025 ELECTRICITY GENERATION