phase3
phase3
Merge branch 'master' into phase3

Conflicts:
	.gitignore
commit before merge
Merge branch 'phase3' into dev

Conflicts:
	sites/all/modules/custom/helpfulcard_extra/helpfulcard_extra.module
	sites/all/modules/features/helpfulcard_content_type_review/helpfulcard_content_type_review.features.field_instance.inc
	sites/all/modules/features/helpfulcard_views_my_cards/helpfulcard_views_my_cards.views_default.inc
phase 3 last merges