Stripping CVS keywords
added disable and hide form alters tied to pricing specific permissions
merci_membership_pricing works without any additional content type settings. Moved the additional settings to merci_daypart_pricing
removed fee free hours from pricing schema... leaving that in merci.install
moved and renamed group_merci_cost to merci_pricing.install, fixed issue where commercial cost wasn't beign added within the fieldgroup, fields are now removed when merci_member_pricing module is uninstalled
added lock/unlock for member pricing fields
applied patch for #1064696
added membership pricing permissions and membership discount setting
added merci_pricing module as only dependency