Merge branch 'master' of https://github.com/PyConChina/PyConCN

Conflicts:
	apps/2012/templates/SiteView2012/about.html