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

Conflicts:
	AnimatedModel/AnimatedModel.suo
	AnimatedModel/AnimatedModelProject/Game.cs