icons, blog sidebar, search, author archives
Merge branch 'master' of https://github.com/ComplexCity/complexcity.github.io

Conflicts:
	_posts/2014-05-26-identity-of-chinese-cities.md
	_site/china/cities/2014/05/26/identity-of-chinese-cities.html