Merge branch 'master' of https://github.com/qiangtou/qiangtou.github.com

Conflicts:
	_posts/2014-08-21-install-redmine.md