Update
Merge branch 'master' of https://github.com/KIOS-Research/splace-toolkit

Conflicts:
	SPLACE.m