Merge branch 'staging' into 'coldfix-pbi4'

# Conflicts:
#   lib/Pages/Donation/goods_donation_page.dart
#   test/goods_donation_page_test.dart