require a distinction between master config and user config
add locked settings to json return for auth'ed settings
disable form inputs for values set by master config
add a tooltip to say why locked settings cannot be changed
fix for settings save without organization
use two dashes for url as command line option
handle avatar location changes after avatar position has been reloaded
move url handling to after settings load debug
remove definition for an unused method
Merge pull request #3503 from birarda/domain-wizard

lock changes to settings in the domain-server master config file