flash update

flash update
Merge branch 'master' of https://github.com/sanyueyu/130814_food_ad