* Implemented a new taglib for search
* Modified the navigation JSP to include sling taglibs
Merge branch 'master' of https://github.com/jollyca/sling-explorer

Conflicts:
	ui/src/main/resources/initial-content/libs/sling/servlet/default/edit-pathlist.jsp