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