bump r2 to r3
Merge branch 'test' into develop

Conflicts:
	x86-r2.c
	x86-r3.c
	x86-r4.c