Merge branch 'dev' into projects
Fix user link bug on projects#index page after setting one operator
Merge branch 'projects' into dev