Merge branch 'release-1.0.3' into develop
Merge branch 'hotfix-1.0.4' into develop
Merge branch 'hotfix-1.0.5' into develop
Merge branch 'hotfix-1.0.6' into develop
Merge remote-tracking branch 'origin/hotfix-1.0.7' into develop
updated delta and context for new footer
merge after updated context and delta
Merge branch 'develop'