header not done
Merge remote-tracking branch 'origin/newBranch' into newBranch

Conflicts:
	di05_ThinkTank/src/main/webapp/WEB-INF/jsp/Search.jsp