some updates
stashing
Merge branch 'master' of https://github.com/shhaky/gds_project

Conflicts:
	dev/java/workspace/.metadata/.log
	dev/java/workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/zLib_Logging/.markers
	dev/java/workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/zlib_JSON_Wrapper/.markers
	dev/java/workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	dev/java/workspace/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	dev/java/workspace/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	dev/java/workspace/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	dev/java/workspace/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	dev/java/workspace/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml