changes necessary for deprecating investor table
dvm tweaks for new investor scheme
Merge branch 'devtim'
Merge branch 'master' of https://github.com/timbrady/htdocs

Conflicts:
	includes/header_no_searchbox.inc