update animator study
Merge remote-tracking branch 'origin/master'

Conflicts:
	Pachinco/Pachinco-csharp.sln
	Pachinco/Pachinco.sln
	Pachinco/Pachinco.userprefs