.
Merge branch 'master' of github.com:mershack/VizOnline

Conflicts:
	Perspectives/src/perspectives/ViewerContainer3D.java
	Perspectives/src/servlets/ViewerCanvas.java
	VizOnline_Web/src/java/main.java
	VizOnline_Web/src/java/perspectives/ViewerContainer.java
	VizOnline_Web/src/java/perspectives/ViewerContainer3D.java
	VizOnline_Web/src/java/servlets/ViewerCanvas.java