wanlong test api
fix bug
Merge branch 'master' into wanlong_test
merge from master
mod inject
mod ds_action_bar
mod framework