Changed settings implementation for easier production deployment
Merge remote-tracking branch 'origin/develop' into develop