fix cordao in the footer and redo address
Merge branch 'development' into staging
Merge branch 'staging'