edit challenges level3
Edit sokoban challenge
Push new Unity version changes
Last push
edit challenges level1
add big bad guy challenge level3
test new particules system
Edit mine prefab, add first mine challenge test
sorting and adding new content
edit map size and challenges
edit project hierarchy and library
edit challenges
edit mine challenge
level 1 upadated, level 2 and 3 updated - (Graphics)
Edit scene hierarchy, new master scene
edit scene assets
Update Unity version
manually merged gui into master
Merge branch 'origin/master'
Merge branch 'origin/master'

Conflicts:
	Assets/Data/raph/userDevices.xml
	Assets/Master-Common.unity.meta
	Assets/Resources/Atlases/BioBricks.meta
	Assets/Resources/Atlases/BioBricks/BioBricks.png.meta
	Assets/Resources/Atlases/BioBricks/RBS.png.meta
	Assets/Resources/Atlases/BioBricks/gene.png.meta
	Assets/Resources/Atlases/BioBricks/promoter.png.meta
	Assets/Resources/Atlases/BioBricks/terminator.png.meta
	Assets/Resources/Atlases/Refractive.meta
	Assets/Resources/Atlases/Refractive/Refractive Atlas - Bump.psd.meta
	Assets/Resources/Atlases/Refractive/Refractive Atlas - Masks.psd.meta
	Assets/Resources/Atlases/Refractive/Refractive Atlas.psd.meta
	Assets/Resources/Atlases/TestAtlas/bullet.png.meta
	Assets/Resources/Atlases/TestAtlas/bulletHovered.png.meta
	Assets/Resources/Atlases/TestAtlas/bulletPressed.png.meta
	Assets/Resources/Atlases/TestAtlas/square-grey.png.meta
	Assets/Resources/Atlases/WindowsGUI/WindowGUI.png
	Assets/Resources/Atlases/WindowsGUI/WindowsGUI.mat
	Assets/Resources/GUI/screen1/Devices.meta
	Assets/Resources/GUI/screen3/BioBricks.meta
	Assets/Scenes/Screen1.unity
	Assets/Scripts/Common.meta
	Assets/Scripts/Common/DisplayedElement.cs.meta
	Assets/Scripts/Craft.meta
	Assets/Scripts/Devices/DevicesDisplayer.cs
	Assets/Scripts/Devices/DisplayedDevice.cs
	Assets/Scripts/DisplayedBioBricks.meta
	Assets/Scripts/DisplayedDevices.meta
	Assets/Scripts/Logger.meta
	Assets/Sounds.meta
	ProjectSettings/GraphicsSettings.asset
	ProjectSettings/ProjectSettings.asset