no message
Merge branch 'master' of https://github.com/Percyvalle/RG

Conflicts:
	RG/RG/RG.userprefs