added
changed

Merge branch 'master' of https://github.com/VectorPosse/NATSAP

Conflicts:
	test_collaborate.txt