added a battery bar for rain
fixed content merge conflict