remove console debug print
show has_many associations in merge preview
add merge log; make merging work after meeting with Russ
update ref
Merge branch 'c4c.staging.mergetool' into c4c.dev

Conflicts:
	db/development_structure.sql
	vendor/plugins/mh_common