Merge branch 'develop' into 036-Contact_us
task #036-Contact_us: Minor fix
Merge branch '036-Contact_us' into develop