work on jekyll ...
Merge branch 'dev' of github.com:jerryjianjun/xboot into dev

Conflicts:
	documents/website/_posts/2013-09-14-jekyll-markdown-samples.md