merge some about biao
Merge branch 'john'