merci 6.x-2.0-beta4

Changes since DRUPAL-6--2-0-BETA3:

• Fixed issue with local timezone offset disrupting the conflict grid.
• added merci prefix to add_group_taxonomy and create_cck_fields functions. commented out merci_check_default_timezone() since the function doesn't exist
• Fixed bug where a conflict occurred if a reservation in the past had an item still checked out, and the admin attempted to change the status of a future reservation for that item to "Canceled". Now, if the reservation status is changed to either "Checked in", "Canceled" or "No Show" the item conflict validation code is bypassed.
• Fixed issue #862032
• Fixed issue #862066
• Fixed issue #834868
• Fixed issue #425372
• Fixed issue #562574
• add hook_content_extra_fields to allow some basic manipulation of the fields MERCI adds to the merci_reservation content_type
• Changed weight of merci options cck.
• added new views field handler. this field show reserved items for a reservation.
• Added auto assign bucket items option for bucket content type. This option if set will select and assign a bucket item when a reservation is created.
• Fixed issue #911404 type name should be limited to 32 char.