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

Conflicts:
	RG/RG/Assets/Materials/SkyTest.mat
	RG/RG/Assets/Standard Assets/Particles/Sources/Materials/Smoke5.mat
no message
Merge branch 'master' of https://github.com/Percyvalle/RG

Conflicts:
	RG/RG/RG.userprefs