Fixed issue #571718 wrong arguments were passed to merci_check_content_type_restrictions in validation function.

committed initial changes for #462758, but commented out the $tokens['node']['merci_resources'] until that error is resolved.

Also added admin_hours setting for the conflict grid to show hours outside of hours of operation.  I set a default for that avraible of 07:00-23:00.  That shoudl address #543244 where users don't see the grid when they configure MERCI without setting the hours of operation.

replaced tabs with spaces and fixed a few other minor formatting issue to address the coder fans in issue #661204

Fixed date comparison bug for reservation start date cannot exceed the max advance as old code compared string values not date values.

Fixed issue 2369466.  Fixed problem with new cost number fields and group taxonomy not being added on merci upgrade.

rolled back some of the bounty changes that created validation errors.  Will post issues/patches for the changes I rolled back so other people can help with testing

unset save and preview option any Reservation with a status of Pending or greater for user without Administer MERCI permission to address issue #652850

unset the merci_member_cost and merci_commercial cost fields on Reservation form.  Those are there to make summary Views easier to create.

removes MERCI Inventory Group and start organizing Buckets by that taxonomy. Still an issue with the Select

added field_merci_member_cost and field_merci_commercial_cost to merci_reservation content type to make it easier and less of a resource hit to create Views that summarize costs by project/user

fixed cron functions.  merci_auto_checkout and merci_auto_checkout were mistakenly rolled back to the debug version at some point