Merge branch 'master' of https://github.com/TikhomirovSergey/primitive

Conflicts:
	primitive/src/test/resources/settings.json