forecast
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/views/location.html