add new fields in find tenders methods
Merge branch 'branch1.0'

Conflicts:
	build/classes/tendergrabber/MySQLConnector.class
	nbproject/private/private.xml
	src/tendergrabber/MySQLConnector.java