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

Conflicts:
	TODO/TODO.txt