Merge branch 'master' of https://github.com/CS4311-TBA/VisKo

Conflicts:
	visko/visko-web/WebContent/Main/index.jsp
changes in 3d_volumeRendering