animation sprite
Merge remote-tracking branch 'origin/master'

Conflicts:
	Nope/Nope-csharp.sln
	Nope/Nope-csharp.v12.suo
	Nope/Nope.sln