changes done to footer
Merging issue-45 into develop and resolving conflicts