fix some
Merge branch 'development' of github.com:jsgirls/jsgirls.org into development

Conflicts:
	src/documents/events/sapporo-201404.html.jade.eco
merge