site template: dynamic collapsible and lef/right panel added
Merge remote-tracking branch 'origin/master'

Conflicts:
	weatherapp/templates/index.html
Merge remote-tracking branch 'origin/master'