save
Merge branch 'master' of https://github.com/pkonovalov-softheme/ii

Conflicts:
	Core/ChallengeManager.cpp