updates
Merge branch 'master' of
https://github.com/moabdelhadi/dmg-rg-client.git

Conflicts:
	.classpath
	.settings/org.eclipse.jdt.core.prefs