into func
Merge branch 'newFeature.intoFunc' into develop
add some new function
add two funcitons
2.0 all function done....