Fix for issue 968: Fix notice on dashboard warning users about using non-gecko based browsers
Added a gem to Gemfile to make it work on Mac OS X 10.6
Merge pull request #971 from danielstjules/issue-968

Fix for issue 968: Fix notice on dashboard warning users about using non-gecko based browsers
Closes #968
Merge pull request #979 from Keraunos/MacOSXGemfile

Added a gem to Gemfile to make it work on Mac OS X 10.6 (with ruby 1.8.7)
Fix issue-953: gave the annotation category pane a percentage-based width and added a min-width to the body.
Fix for issue-415: no longer need to use h to sanitize strings. It's handled by default in Rails 3
Fix for issue-982: doc/app added to .gitignore
Merge pull request #983 from danielstjules/issue-982

Fix for issue-982: doc/app added to .gitignore
When you run "rake doc:app", documentation is generated in /doc/app/. This folder should be added to .gitignore to avoid accidental inclusion in commits.
Closes #982.
Merge pull request #985 from danielstjules/issue-415

Fix for issue-415: no longer need to use h to sanitize strings. It's handled by default in Rails 3
Closes #415
Merge pull request #984 from danielstjules/issue-953

Fix issue-953: gave the annotation category pane a percentage-based width and added a min-width to the body.
Closes #953
Fix for issue-860: assignments are now sorted by due_date in ascending order by default
Merge pull request #988 from danielstjules/issue-860

Fix for issue-860: assignments are now sorted by due_date in ascending order by default
Closes #860
Merge remote-tracking branch 'origin/master' into machinist2