Bug fixed
Merge branch 'Debug' into Dev

Conflicts:
	r1text.txt