Merge branch 'hotfix/groupC' into develop
Merge branch 'hotfix/groupdD' into develop
Colour change in background
navbar current page effect
Merge branch 'develop'