marque de quoi
Merge branch 'master' of https://github.com/zackniwa/ShowCrasher

Conflicts:
	Assets/Xffect/Example_Mobile/Materials/burning_fire.mat
	Assets/Xffect/Example_Mobile/Materials/fire_up.mat
	Assets/Xffect/Example_Mobile/Materials/grad1.mat
	Assets/Xffect/Example_Mobile/Materials/spell_rune.mat
	Assets/Xffect/Examples/Materials/bomb1.mat
	Assets/Xffect/Examples/Materials/bomb2.mat
	Assets/Xffect/Examples/Materials/fogs2.mat
	Assets/Xffect/Examples/Materials/hit3.mat
	Assets/Xffect/Examples/Materials/trail16.mat
	Assets/Xffect/Tutorial/API Usage/AttractAffector/attraction_and_collision.unity
	Assets/Xffect/Tutorial/API Usage/MagicChain/magic_chain.unity
	Assets/Xffect/Tutorial/API Usage/MagicChain/magicchain.mat
	Assets/Xffect/Tutorial/API Usage/SimpleStart/simple_start.unity
	Assets/Xffect/xft_demo_mobile.unity