backup
Merge branch 'master' of https://github.com/nobnak/ParticleSphere

Conflicts:
	PointMesh/PointMesh.userprefs