test 15.20
Merge branch 'master' of https://github.com/kantorn/test1

Conflicts:
	AnimatedModel/AnimatedModel.suo