blowout
copied
Merge branch 'master' into next

Conflicts:
	static/scripts/src/views/placelit_bb.coffee
	static/scripts/src/views/placelit_bb.js
	templates/base.tmpl
	templates/home.tmpl