-fix character sliding issue
Merge branch 'master' of https://github.com/moleculeone/abugsgame

Conflicts:
	Assets/New Terrain 7.asset
	Assets/Unsorted/New Terrain 6.asset