Merge branch 'qa' into development
hopefuly fixed the weather
Merge branch 'development' into qa