20140803修改；
Merge branch 'dev' into gh-pages