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

Conflicts:
	primitive/primitive-0.3-sources.jar
	primitive/primitive-0.3.jar