Attempt to fix error formatting
resolved conflicts
Merge branch 'develop' of https://github.com/gsdlab/ClaferMooVisualizer into develop

Conflicts:
	Server/Client/configuration.js