Changed footer position
Develop merge