added reset skip
Merge branch 'origin/master'

Conflicts:
	src/astley/states/RollinState.as