Fix for default settings not applying
Merge branch 'development' of github.com:sajax/live-dashboard into development