updated awesome_page
Merge branch 'small-conflict'
resolved merge conflict