branch artsiom commit 1
hot fix commit
Merge branch 'artsiom'

Conflicts:
	test/AppDelegate.h