edit due date categories controller actions / model methods, pending views
Merge pull request #141 from joh641/due-date-categories

controller actions / model methods for modifying due date categories
Added tests to admin reservation controller spec
Merge pull request #142 from joh641/reservationAdminControllerSpec

Added tests to admin reservation controller spec
Dropdown menu for user reservations table
Merge pull request #143 from joh641/newFeature

Dropdown menu for user reservations table
Merge branch 'master' into my_reservations

Conflicts:
	app/views/reservations/_actions.html.haml