commit all 2014-11-18 20:33:30

Signed-off-by: bailaobo <bailaobo@163.com>
commit all 2014-11-19 21:01:54