Merge branch 'develop' of https://github.com/PaddlePaddle/book into fix_a_display_error_in_image_classification