Merge branch 'homepage' into dev
Show only allowed user role types for logged in user on users#index page
Add JD field to settings page
Merge branch 'dev' into homepage