addded links, fixes #189
Merge branch 'shifts_v2' into rails2_master