Merge remote-tracking branch 'upstream/develop' into reports_controllers
Merge remote-tracking branch 'upstream/develop' into js_reconfig
switched to using named paths for reports controllers
Merge branch 'reports_controllers' into js_reconfig
merge with js_reconfig
Merge branch 'without_users' into navbar_admin