Merge remote-tracking branch 'origin/develop' into develop
Modified user_system/views.