fixed
Merge branch 'master' of https://github.com/hirorir/PictoCruz

Conflicts:
	Assets/Scripts/ScrollBox.cs
	Library/assetDatabase3
	Library/guidmapper