Fixed merge.
Merge branch 'master' of https://github.com/demansn/Yin-Yan

Conflicts:
	Assets/Scenes/L.1.1.unity
	Assets/Scenes/Main.unity
Update movementControlle, added backward rotation
Level Text ready.
Optimized decals
Update main scene
Icon Image. Scale controller.
Merge branch 'demansn_dev'

* demansn_dev:
  Update main scene
  Optimized decals
  Update movementControlle, added backward rotation

Conflicts:
	Assets/Prefab/TestBlock.prefab
Merge branch 'master' of https://github.com/demansn/Yin-Yan

# By s1koka
# Via s1koka
* 'master' of https://github.com/demansn/Yin-Yan:
  Icon Image. Scale controller.
Update prefabs
Fixed trail scale