Update settings for users
Update settings for users and administrator

Conflicts:
	commons-component-common/src/main/java/org/exoplatform/commons/notification/impl/setting/UserSettingServiceImpl.java
Update settings for users and administrator - fix test