Merge branch 'dev'
Merge branch 'dev'
company page
nid field changed
Merge branch 'master' into dev
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	sites/all/modules/custom/helpfulcard_rating/helpfulcard_rating.module