Merge branch 'master' of github.com:kiwik/kiwik.github.io

Conflicts:
	_posts/2014-08-26-解决OpenStack-gerrit-29418端口被封不能提交代码的问题.md
Merge remote-tracking branch 'origin/master'

Conflicts:
	_posts/2014-08-26-解决OpenStack-gerrit-29418端口被封不能提交代码的问题.md