small fixes
Merge remote-tracking branch 'origin/Develop' into Develop

Conflicts:
	src/main/webapp/WEB-INF/pages/portal/admin/search/searchPage.ftl
Annotations in service beans changed to @Component
Working on search page jquery logic
Merge remote-tracking branch 'origin/Develop' into Develop