Fix wrong collector issue when using join and no document is returned
Form login for NTLM in the renderer
Remove unwanted file

Conflicts:
	src/main/webapp/images/.DS_Store