fix some bugs
fix some bugs
Merge branch 'mathFrankxin'
fix some bugs
add jquery 1.11.1
fix bugs
do test
do some things
change touch event
add icon
xin