test remove activateVersion
Merge branch 'master' of github.com:testobject/calculator

Conflicts:
	build.gradle