include survey.properties in generated files
change expiration date of s3 policy to 2025
Merge branch 'feature/frontend' of github.com:akvo/akvo-flow into feature/frontend