users controller -> user_reports controller, orphans controller -> organization_reports controller
js now included as needed
upgraded without_users UI
added necessary css to stick toolbar to top
added necessary css to stick toolbar to top
added admin-only navbar links
added styling to tighten up the spacing of the links in the navbar
Merge remote-tracking branch 'upstream/develop' into reports_controllers
Merge remote-tracking branch 'upstream/develop' into js_reconfig
merged upstream/develop
Merge branch 'without_users' into navbar_admin
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
Merge branch 'develop' of https://github.com/tansaku/LocalSupport into without_users
pulled back in old changes, and upstream develop
Merge branch 'without_users' into navbar_admin
merge without_users, fixed bug in path for cuke assertions
views added