fixed a curly brace syntax error that was causing a scope to be interpreted incorrectly
Merge branch 'master' of https://github.com/YaleSTC/shifts

There was an issue with the data_field default scope that caused the data objects index page to throw an error. Fixing the syntax fixed the error.
addded links, fixes #189
Merge branch 'shifts_v2'
fixed a javascript bug in index
Merge branch 'master' of github.com:YaleSTC/shifts
added status controller
fixed deprecated use of RAILS_ROOT, improved ReportItems join, removed unnecessary script files and rake tasks
Merge pull request #196 from YaleSTC/time_slots_hotfix

Time slots hotfix
updated to mysql2 adapter
Merge branch 'master' of github.com:YaleSTC/shifts
fix for sub requests during DST changes
fix for sub requests
final DST fixes woo
pulling in fix for DST from rails2 branch
added in date sort for shift history form
Merge branch 'master' into 192_All_shifts_view