add boris moduls + bugfixes
hide question and answers exposed filters if view has no results
Merge branch 'dev_oliver_fixes' into stage-2013-10-21

Conflicts:
	sites/all/modules/custom/profiles/profiles.ds.inc
	sites/all/modules/custom/profiles/profiles.views_default.inc