initial qa settings
Merge branch 'develop' into feature/be-test
initial qa config
initial qa config
nginx conf bug fixes
apache conf bug fixes
Merge branch 'feature/be-test' into develop