merge master
Merge branch 'master' into gh-pages

Conflicts:
	code4hk-badge.html