20140616添加示例
Merge branch 'dev' into gh-pages