Merge branch 'development' into qa
more logging for weather
fixing new employee roles and password
Merge branch 'qa' into development