Tested with Drupal 7.24 and CiviCRM 4.4.2
Merge branch 'master' of github.com:kenwest/cbf-drupal

Conflicts:
	cbf.module
	cbf_civicrm.module
	php/CRM/Event/Form/Registration.php
	templates/CRM/Contact/Page/View/Summary.tpl
	templates/local/citybibleforum_footer.tpl
	templates/local/citybibleforum_header.tpl
	templates/local/citywoman_footer.tpl
	templates/local/citywoman_header.tpl
	templates/local/smith_footer.tpl
	templates/local/smith_header.tpl