Update settings
Merge branch 'staging' of github.com:joegattnet/joegattnet_v3 into staging