Beginning to try security, as well as fixing images showing for locations
Merge branch 'master' of https://github.com/Nayshlok/Voyager

Conflicts:
	Voyager/WebContent/locations.jsp
	Voyager/WebContent/resources/main.css