cleanup
Merge branch 'master' of https://github.com/rburda/nodc

Conflicts:
	src/main/webapp/content/bookmarkletSearch.html