Merge branch 'master' of https://github.com/dmorse/simpatico into devel
Change to gitignore
Temporarily commented out setEta in NPTMTKMove (disabled)
Merge branch 'devel' of https://github.com/TaherGhasimakbari/simpatico into devel

Conflicts:
	.gitignore