- modify headline on welcome page
- change lens icon for simple search
Merge remote-tracking branch 'origin/develop' into gui-restructure
nothing
nothing
Merge branch 'develop' into gui-restructure

Conflicts:
	imeji_presentation/src/main/webapp/Welcome.xhtml
Welcome page: headline rendered removed to avoid error on initialization for other pages