uloste
Merge remote branch 'origin/master'

Conflicts:
	Assets/pasi/sprite_collections/game_sprite_collection Data/game_sprite_collection.prefab
	Assets/pasi/sprite_collections/game_sprite_collection.prefab
	Library/assetDatabase3
	Library/guidmapper