Improved accuracy of velocity <-> energy conversion.
Choose (non-)relativistic conversion with smallest round-off errors.
Merge branch 'master' into noNR

Conflicts:
	particle.h