some stuff. Have to solve index updating and user managemnet and report generation
Merge branch 'matt'

Conflicts:
	search.php