work
Merge branch 'master' of https://github.com/HewPenguin/develop

Conflicts:
	workspace_develop/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.markers.snap
	workspace_develop/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.syncinfo.snap
	workspace_develop/.metadata/.plugins/org.eclipse.core.resources/.projects/hew_dev/.indexes/5b/history.index
	workspace_develop/.metadata/.plugins/org.eclipse.core.resources/.projects/hew_dev/.markers.snap
	workspace_develop/.metadata/.plugins/org.eclipse.core.resources/.projects/hew_dev/.syncinfo.snap
	workspace_develop/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	workspace_develop/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	workspace_develop/.metadata/.plugins/org.eclipse.core.resources/.root/2.tree
	workspace_develop/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	workspace_develop/.metadata/.plugins/org.eclipse.core.resources/.snap
	workspace_develop/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	workspace_develop/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	workspace_develop/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	workspace_develop/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	workspace_develop/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml