dev
update kity
merge from panzheng