commit
Merge branch 'master' of https://github.com/Melkhior/GameArxProject

Conflicts:
	ZRunner/Assets/Infinite Runner/Materials/Weapon.mat
	ZRunner/Assets/MyRunner/MoveTest.unity
	ZRunner/Library/AssetServerCacheV3
	ZRunner/Library/InspectorExpandedItems.asset
	ZRunner/Library/ProjectSettings.asset
	ZRunner/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	ZRunner/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	ZRunner/Library/ScriptAssemblies/Assembly-CSharp.dll
	ZRunner/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	ZRunner/Library/assetDatabase3
	ZRunner/Library/expandedItems
	ZRunner/Library/guidmapper
	ZRunner/Library/metadata/01/014cab8980bc0ab439293a2da795b518
	ZRunner/Library/metadata/03/035b5429e5ede1d4190fbc62b9c5705c
	ZRunner/Library/metadata/07/07e47a95a0bdb324596e710e830a6dc7
	ZRunner/Library/metadata/08/0816377fcde9b1340b1d498d7099a6fa
	ZRunner/Library/metadata/0c/0c1388af98f2470438dfa54a8eaef638
	ZRunner/Library/metadata/11/11bd5a79778f6684488c58fed82d32a5
	ZRunner/Library/metadata/12/12af5216f35f1424d919e5407089865b
	ZRunner/Library/metadata/16/16689a5a7b7509148a70f75b56655e12
	ZRunner/Library/metadata/19/1980daa94102f93478dbc6f6518359a9
	ZRunner/Library/metadata/1a/1ad1058eefc111c41958aac2922bd741
	ZRunner/Library/metadata/20/20ecce0341685024483a9c5548b769a5
	ZRunner/Library/metadata/22/2243f49ea42a8844d99365740415403e
	ZRunner/Library/metadata/23/23781a3d467c6d24da323be184348a01
	ZRunner/Library/metadata/23/239de8ea137fdab4eb2301cb3918bc34
	ZRunner/Library/metadata/25/258f541541ef8b74392d60d4668d0d0a
	ZRunner/Library/metadata/41/41f01862e2fce514ab3e58e00d518701
	ZRunner/Library/metadata/42/429bdad4b889ddf43b1398c337183629
	ZRunner/Library/metadata/49/49648e470c0a2aa47ba372a72b494663
	ZRunner/Library/metadata/50/503353785f335be4a8a29e9d27931a1e
	ZRunner/Library/metadata/52/523ad8c2c1d913e43ba367ee452c665c
	ZRunner/Library/metadata/56/562a87ff0671a2c4cb54df12c7b6d8c0
	ZRunner/Library/metadata/5a/5aa53e2b2d40cad49b706f1cea27174d
	ZRunner/Library/metadata/5d/5db4869787e26854a82ea8973a528d6e
	ZRunner/Library/metadata/60/60e8dc78ff5ba8d4fa32b0b031cbccc9
	ZRunner/Library/metadata/63/63a3fe6b87caa4347bfa226bfc0e8110
	ZRunner/Library/metadata/66/66b882682495ef84899275edfb081f1a
	ZRunner/Library/metadata/6d/6d95cd5dd83892c45b5ffbb75ad9a3ed
	ZRunner/Library/metadata/70/70f7327d1dc9ce54dbd0aaf5b2b7b46c
	ZRunner/Library/metadata/7b/7b5bbba4b99ef564da960bd2696d0b41
	ZRunner/Library/metadata/7c/7c6557fe3d6843449b20a4019e3158ba
	ZRunner/Library/metadata/88/888cc731641e8344dbf5b7a5d956d251
	ZRunner/Library/metadata/92/9202006b7faeea04c843c1ea70e4bd01
	ZRunner/Library/metadata/92/924de8fc698af414695ab7d913e1257b
	ZRunner/Library/metadata/93/93f4b464712249040adedd1996070dbb
	ZRunner/Library/metadata/96/96964101181788a4da60a2604ab81742
	ZRunner/Library/metadata/96/96f79771f06068d41b43ce8c33c5d755
	ZRunner/Library/metadata/99/992dc5345c38d6a418a2048db54eea57
	ZRunner/Library/metadata/9e/9e61cc8bb47203243bf7118c489ea8b1
	ZRunner/Library/metadata/a4/a40501a7d0ebd9d49a14c0b93c935ecd
	ZRunner/Library/metadata/a5/a5ea8e1c10c8cee4eb826bf1bfaf7321
	ZRunner/Library/metadata/a8/a8c4e620ca83ae1428e2fbbb0d1ec6c9
	ZRunner/Library/metadata/a9/a93d313877bd18b4fbf1a1ee98d0eb51
	ZRunner/Library/metadata/ab/abcda246528b21e46b929b82f3988d6b
	ZRunner/Library/metadata/b1/b1b7ae8f3dfdd684685b430306cc47da
	ZRunner/Library/metadata/b4/b483efbff2928c24da99c42747360ecd
	ZRunner/Library/metadata/bb/bb0057b8c65306c42bd7fcbd245e47d7
	ZRunner/Library/metadata/bd/bd1274b5c62a7544a8cc50e38b5d0ef2
	ZRunner/Library/metadata/c0/c00dd97ff4bb2f840bcf4cfc32706f24
	ZRunner/Library/metadata/c5/c56ae64518c6510489b106db9c093d87
	ZRunner/Library/metadata/c5/c5802eaa97f07b64487344fb0a62309c
	ZRunner/Library/metadata/c6/c66faae3c3a66cd43a7f391119aca343
	ZRunner/Library/metadata/c8/c854e47a9a8013e42ac4608c0d8f509c
	ZRunner/Library/metadata/c9/c96d25cb7db819d4fad4e589ff6c67f6
	ZRunner/Library/metadata/cb/cbf4760893af9ab4c9b7a62984156640
	ZRunner/Library/metadata/cc/cc3c2c99c3982c342940d57ba24891b2
	ZRunner/Library/metadata/cc/cc722e02e3821934e974a39b34ea3253
	ZRunner/Library/metadata/d1/d1ebcd00c1d17d441abe69a60007327e
	ZRunner/Library/metadata/da/da976b1a4f7ebb949b0f71341e4f1821
	ZRunner/Library/metadata/e7/e760dc06c6ef1ec4f8a1776e469bf5ab
	ZRunner/ZRunner.userprefs