easy fix
Merge remote-tracking branch 'origin/Develop' into Develop

Conflicts:
	src/main/webapp/resources/js/pages/searchPage.js
Merge remote-tracking branch 'origin/Develop' into Develop
added active button default on SearchPage
fixing reset button