merge master
changed img
footer