del pre_page
Merge branch 'master' into doufm