Fix bug loading attribute values
Commented out sample editor settings page
Merge remote-tracking branch 'graffy76/usersettings'