added time range
added search by term and database by type.
db corrections
stuff
Merge branch 'databaseChange'

Conflicts:
	public/data.php