Add map
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/css/template.css
	templates/common/layout.html