fixing merge bugs
Merge branch 'cameramov'

Conflicts:
	Assets/Scripts/Block_Move.cs