update germplasm query and sidebar
Merge branch 'master' of https://github.com/acanedairri/StrasaWeb
Merge branch 'master' of https://github.com/acanedairri/StrasaWeb
Merge branch 'master' of https://github.com/acanedairri/StrasaWeb
update gemrplasm query
update germplasm query
Merge branch 'master' of https://github.com/acanedairri/StrasaWeb

Conflicts:
	src/java/main/org/strasa/middleware/manager/GermplasmManagerImpl.java
Merge branch 'master' of https://github.com/acanedairri/StrasaWeb