header + footer
Merge branch 'master' of https://github.com/kinnou02/openbeerplanner

Conflicts:
	openbeerplanner/templates/map.html