20140809jQuery之三目运算
Merge branch 'dev' into gh-pages