a
Merge remote-tracking branch 'origin/master'

Conflicts:
	CPU_MD/CPU_MD/default.cfg
	CPU_MD/CPU_MD/si_place_and_velocity
	CPU_MD/CPU_MD/si_potential
	CPU_MD/CPU_MD/xe_place_and_velocity
	CPU_MD/CPU_MD/xe_potential