Merge branch 'master' of github.com:xuechendi/xuechendi.github.io into source

Conflicts:
	atom.xml
	blog/archives/index.html
	blog/categories/ceph/atom.xml
	blog/categories/fun/atom.xml
	blog/categories/ha/atom.xml
	blog/categories/linux/atom.xml
	blog/categories/octopress-test/atom.xml
	blog/categories/storage/atom.xml
	sitemap.xml
Merge branch 'source' of github.com:xuechendi/xuechendi.github.io into source
Modification if HA post from mac