Merge branches 'lwby_advert_1' and 'master' of http://gitlab.ibreader.com/maliang/lwby_ad_data into lwby_advert_1