changes for pcv demo
Merge branch 'master' into pcv-demo

Conflicts:
	themes/default/views/reports/main.php
	themes/default/views/reports/reports_js.php
Merge branch 'pcv-demo'