Unity3d Changes

To Text based materials
Merge branch 'master' of https://github.com/Cryslo/EMSRisicoStage

Conflicts:
	EMSBrandBlusSim/Assets/Materials/Fire 1.mat
	EMSBrandBlusSim/Assets/Materials/Fire 2.mat
	EMSBrandBlusSim/Assets/Materials/Smoke part 1.mat
	EMSBrandBlusSim/Assets/Materials/Smoke part 2.mat

EMSBrandBlusSim/Assets/Resources/Resources/SWFs/Menu/BrandSimDesign_720.
swf/BrandSimDesign_720.swf.bytes

EMSBrandBlusSim/Assets/Resources/Resources/SWFs/Menu/Folder_Boxes.swf/Fo
lder_Boxes.swf.bytes

EMSBrandBlusSim/Assets/Resources/Resources/SWFs/Menu/Loading.swf/Loading
.swf.bytes

EMSBrandBlusSim/Assets/Resources/Resources/SWFs/Menu/Object_Scene_Holder
.swf/Object_Scene_Holder.swf.bytes

EMSBrandBlusSim/Assets/Resources/Resources/SWFs/Menu/OtherDragable.swf/O
therDragable.swf.bytes

EMSBrandBlusSim/Assets/Resources/Resources/SWFs/Menu/PropertyScreen.swf/
PropertyScreen.swf.bytes

EMSBrandBlusSim/Assets/Resources/Resources/SWFs/Menu/Red_cross.swf/Red_c
ross.swf.bytes

EMSBrandBlusSim/Assets/Resources/Resources/SWFs/Menu/SmokeDragable.swf/S
mokeDragable.swf.bytes

EMSBrandBlusSim/Assets/Resources/Resources/SWFs/Menu/Test_folder.swf/Tes
t_folder.swf.bytes

EMSBrandBlusSim/Assets/Resources/Resources/SWFs/Menu/VuurDragable.swf/Vu
urDragable.swf.bytes

EMSBrandBlusSim/Assets/Resources/Resources/SWFs/Menu/Waas.swf/Waas.swf.b
ytes
	EMSBrandBlusSim/Assets/Scenes/Main.unity
	EMSBrandBlusSim/Assets/Standard
Assets/Particles/Sources/Materials/Smoke1.mat
	EMSBrandBlusSim/Library/assetDatabase3
	EMSBrandBlusSim/Library/metadata/07/07036d57c9da08e4ba6503b095438c4f
	EMSBrandBlusSim/Library/metadata/0c/0c80d00074634a8438df1dc632f9590c
	EMSBrandBlusSim/Library/metadata/2b/2b21364bb71d4eb4dbce6894c82cd119
	EMSBrandBlusSim/Library/metadata/3a/3a967e9bd6ba0ad48ae915376208e53f
	EMSBrandBlusSim/Library/metadata/40/408ea63c9def62d499e9e03f61f7f875
	EMSBrandBlusSim/Library/metadata/4e/4e19cba94561df140a104a47d73070dd
	EMSBrandBlusSim/Library/metadata/4e/4efe5620a91cf9542993ee04a027a7f5
	EMSBrandBlusSim/Library/metadata/62/62f7c8a57ece2204695f3c7dc963d23c
	EMSBrandBlusSim/Library/metadata/72/72fb5469d806a4b4da6b06f70cf8dc67
	EMSBrandBlusSim/Library/metadata/74/74bcba72c2286ce429281c86d5928418
	EMSBrandBlusSim/Library/metadata/79/79f4debe8158ebf4fbb6a651731a0186
	EMSBrandBlusSim/Library/metadata/7d/7dca5dff796eb47908302d505dcb19b0
	EMSBrandBlusSim/Library/metadata/83/83dcfe48683524a338fa1336726311e2
	EMSBrandBlusSim/Library/metadata/91/917a23a1910c84407884f71de072d65c
	EMSBrandBlusSim/Library/metadata/96/96558d9af5ccba84da0a06dc9afa072d
	EMSBrandBlusSim/Library/metadata/ad/ad90f586d4fe1b942b46f0da520a0e61
	EMSBrandBlusSim/Library/metadata/bb/bb393e804ad0e204cb1fcfbc9b8b0409
	EMSBrandBlusSim/Library/metadata/c1/c1eb35b1a54ae704fb5d11b6fe33280b
	EMSBrandBlusSim/Library/metadata/e0/e0dab934e4ea2504abc26de3ffa7ed31
	EMSBrandBlusSim/Library/metadata/e6/e61a37afcbbb69f489b55ae822fd05a1
Merge branch 'master' of https://github.com/Cryslo/EMSRisicoStage

Conflicts:
	EMSBrandBlusSim/Assets/Materials/Fire 1.mat
	EMSBrandBlusSim/Assets/Materials/Fire 2.mat
	EMSBrandBlusSim/Assets/Materials/Smoke part 1.mat
	EMSBrandBlusSim/Assets/Materials/Smoke part 2.mat

EMSBrandBlusSim/Assets/Resources/Resources/SWFs/Menu/BrandSimDesign_720.
swf/BrandSimDesign_720.swf.bytes

EMSBrandBlusSim/Assets/Resources/Resources/SWFs/Menu/Folder_Boxes.swf/Fo
lder_Boxes.swf.bytes

EMSBrandBlusSim/Assets/Resources/Resources/SWFs/Menu/Loading.swf/Loading
.swf.bytes

EMSBrandBlusSim/Assets/Resources/Resources/SWFs/Menu/Object_Scene_Holder
.swf/Object_Scene_Holder.swf.bytes

EMSBrandBlusSim/Assets/Resources/Resources/SWFs/Menu/OtherDragable.swf/O
therDragable.swf.bytes

EMSBrandBlusSim/Assets/Resources/Resources/SWFs/Menu/PropertyScreen.swf/
PropertyScreen.swf.bytes

EMSBrandBlusSim/Assets/Resources/Resources/SWFs/Menu/Red_cross.swf/Red_c
ross.swf.bytes

EMSBrandBlusSim/Assets/Resources/Resources/SWFs/Menu/SmokeDragable.swf/S
mokeDragable.swf.bytes

EMSBrandBlusSim/Assets/Resources/Resources/SWFs/Menu/Test_folder.swf/Tes
t_folder.swf.bytes

EMSBrandBlusSim/Assets/Resources/Resources/SWFs/Menu/VuurDragable.swf/Vu
urDragable.swf.bytes

EMSBrandBlusSim/Assets/Resources/Resources/SWFs/Menu/Waas.swf/Waas.swf.b
ytes
	EMSBrandBlusSim/Assets/Scenes/Main.unity
	EMSBrandBlusSim/Assets/Standard
Assets/Particles/Sources/Materials/Smoke1.mat
	EMSBrandBlusSim/Library/assetDatabase3
	EMSBrandBlusSim/Library/metadata/07/07036d57c9da08e4ba6503b095438c4f
	EMSBrandBlusSim/Library/metadata/0c/0c80d00074634a8438df1dc632f9590c
	EMSBrandBlusSim/Library/metadata/2b/2b21364bb71d4eb4dbce6894c82cd119
	EMSBrandBlusSim/Library/metadata/3a/3a967e9bd6ba0ad48ae915376208e53f
	EMSBrandBlusSim/Library/metadata/40/408ea63c9def62d499e9e03f61f7f875
	EMSBrandBlusSim/Library/metadata/4e/4e19cba94561df140a104a47d73070dd
	EMSBrandBlusSim/Library/metadata/4e/4efe5620a91cf9542993ee04a027a7f5
	EMSBrandBlusSim/Library/metadata/62/62f7c8a57ece2204695f3c7dc963d23c
	EMSBrandBlusSim/Library/metadata/72/72fb5469d806a4b4da6b06f70cf8dc67
	EMSBrandBlusSim/Library/metadata/74/74bcba72c2286ce429281c86d5928418
	EMSBrandBlusSim/Library/metadata/79/79f4debe8158ebf4fbb6a651731a0186
	EMSBrandBlusSim/Library/metadata/7d/7dca5dff796eb47908302d505dcb19b0
	EMSBrandBlusSim/Library/metadata/83/83dcfe48683524a338fa1336726311e2
	EMSBrandBlusSim/Library/metadata/91/917a23a1910c84407884f71de072d65c
	EMSBrandBlusSim/Library/metadata/96/96558d9af5ccba84da0a06dc9afa072d
	EMSBrandBlusSim/Library/metadata/ad/ad90f586d4fe1b942b46f0da520a0e61
	EMSBrandBlusSim/Library/metadata/bb/bb393e804ad0e204cb1fcfbc9b8b0409
	EMSBrandBlusSim/Library/metadata/c1/c1eb35b1a54ae704fb5d11b6fe33280b
	EMSBrandBlusSim/Library/metadata/e0/e0dab934e4ea2504abc26de3ffa7ed31
	EMSBrandBlusSim/Library/metadata/e6/e61a37afcbbb69f489b55ae822fd05a1