Game for webconf
Merge branch 'master' of https://github.com/moztw/central

Conflicts:
	htdocs/index.shtml
Merge branch 'master' into production
Merge branch 'production' of https://github.com/moztw/central into production