sale page changed
Merge branch 'sale_page'