Cosas

Cambios
Merge remote-tracking branch 'origin/master'

Conflicts:
	New Unity Project/Library/CurrentLayout.dwlt
	New Unity Project/Library/InspectorExpandedItems.asset
	New Unity Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	New Unity Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	New Unity Project/Library/assetDatabase3
	New Unity Project/Library/expandedItems
	New Unity Project/Library/guidmapper
	New Unity Project/Library/metadata/00/0000000000000000b000000000000000
	New Unity Project/Library/metadata/00/009041545c6b6d44e8014315d8badd8e
	New Unity Project/Library/metadata/01/01eb3460ca11f464ebb995bf0f2d87c1
	New Unity Project/Library/metadata/06/06f4a0a0e43bf484381e580955384964
	New Unity Project/Library/metadata/07/0774aac9907c517449824324a501351e
	New Unity Project/Library/metadata/09/092ca9dc877c91c4db351248a840d0c6
	New Unity Project/Library/metadata/09/09b9b18e706c6854f90ba2d444dd34d8
	New Unity Project/Library/metadata/0e/0e7ed4fbd9924480bbb918e339c570e6
	New Unity Project/Library/metadata/10/1025fdd18c16c214a99bc97dd7e3d46c
	New Unity Project/Library/metadata/17/17f59fbb01de4cd4492354d42459a465
	New Unity Project/Library/metadata/1e/1e1ec16245b7e734ab120026612b067f
	New Unity Project/Library/metadata/28/287828c7bc313c84095aa3870d415827
	New Unity Project/Library/metadata/2d/2d74d018ba3a3ec46b9a18995a6903fe
	New Unity Project/Library/metadata/36/366432653b1e72145a5c35f5309b3da7
	New Unity Project/Library/metadata/36/369281a3bdf2a3d45b91a58e496f1769
	New Unity Project/Library/metadata/38/385a2da7f71e8c8498bb103f40f78b6e
	New Unity Project/Library/metadata/39/39edd11a52859204d80221f97e66fc98
	New Unity Project/Library/metadata/3b/3bca9c42009396a428ed3e218c48d436
	New Unity Project/Library/metadata/40/400c2f66c145548b6a08e6ac69655ea2
	New Unity Project/Library/metadata/43/433b95ac483ca2d499585dfec0a802e3
	New Unity Project/Library/metadata/43/43ceab7bf04a5684bba3ef324ddcdb7a
	New Unity Project/Library/metadata/43/43ef88409a8dda14bbe5746632dfcaf3
	New Unity Project/Library/metadata/45/45f8f7c18936e4b46874fd8df6276185
	New Unity Project/Library/metadata/47/4702c6bf47ebabb41a0cb2056a23a9b3
	New Unity Project/Library/metadata/49/491e6d8e8321631439bb32e1fe509e5f
	New Unity Project/Library/metadata/4e/4ee7be59b25539744bfef7fb1a712a82
	New Unity Project/Library/metadata/5b/5baab583450424889aad7f3f40e9fba5
	New Unity Project/Library/metadata/5f/5f7be0ee4f7649b4f889a43f5089a8b9
	New Unity Project/Library/metadata/63/63eb4fecc77774548b7cb62aa2807928
	New Unity Project/Library/metadata/68/68a37dd6378280641b2922ba8b067c06
	New Unity Project/Library/metadata/69/693b5b7a21e72ef41a15481fa12e2c04
	New Unity Project/Library/metadata/6c/6c56d5638128536469f45faf309bd0cf
	New Unity Project/Library/metadata/6e/6ef7858ac1b886244b212b4704f6b193
	New Unity Project/Library/metadata/73/73b473491223046b3bccb04fdb29c994
	New Unity Project/Library/metadata/74/7420236b3793ae04b8d1011f95997326
	New Unity Project/Library/metadata/74/74dc852b936459c449793268ec605b8e
	New Unity Project/Library/metadata/79/790c8a3f902e5b54193ae8e304100e45
	New Unity Project/Library/metadata/7d/7db6554ea28d135479bd8fc3084de6b3
	New Unity Project/Library/metadata/7f/7f5b7845247cbbc40b21de8310b66a5e
	New Unity Project/Library/metadata/83/830b18403dea84783b74345dea9f0606
	New Unity Project/Library/metadata/85/85ef27b87c6987a4cae484ea2582f781
	New Unity Project/Library/metadata/86/86ac162d8ecb7e7479a2f6d4049f610e
	New Unity Project/Library/metadata/88/88b6f20eeec999343bf17e5d52e52a8a
	New Unity Project/Library/metadata/8b/8b23c9e3952e246c180a8080104ae60b
	New Unity Project/Library/metadata/8d/8d628c337f4068c4f9a1bef8e5ca6c31
	New Unity Project/Library/metadata/8e/8e39b2115492fa74a9429dbbddfbdfd6
	New Unity Project/Library/metadata/8f/8f17505c64acb6e469798892647884f6
	New Unity Project/Library/metadata/90/902873f1336b14507b2ae690b68ecc51
	New Unity Project/Library/metadata/90/909170eb0fc75a74bbd248e8f1b20f97
	New Unity Project/Library/metadata/91/91830034d70ee3d4d89c552b311e91dc
	New Unity Project/Library/metadata/93/93426f1b1b72ade4aa6ea2bfe7376af7
	New Unity Project/Library/metadata/97/9732e64c49e904ff2a10fc7794607fcf
	New Unity Project/Library/metadata/9a/9a769e95a0c537a49ad823e6a3a9b232
	New Unity Project/Library/metadata/9c/9cbc16bd0f03e3540865ae881e3bd8a3
	New Unity Project/Library/metadata/a0/a02c75b912f51b245a395c2dc2aa34af
	New Unity Project/Library/metadata/a0/a05fb2ca95d9df944801ccb5cc6da614
	New Unity Project/Library/metadata/a1/a168e85ab1d4ec442baf542800ff4a95
	New Unity Project/Library/metadata/ab/ab5bb3eb247a4492fa9900f6ac0db050
	New Unity Project/Library/metadata/af/af040a092e2114e9fbd6fab7402e066d
	New Unity Project/Library/metadata/af/afb48ba010de6f047a558d00256405c9
	New Unity Project/Library/metadata/b0/b05310d6464aedb4da387da522c4b6fd
	New Unity Project/Library/metadata/b1/b1be72d31c8264243a72994d9941b3b7
	New Unity Project/Library/metadata/b3/b307b161d7ed51f4ca1890b6ecaba3d6
	New Unity Project/Library/metadata/b3/b346f2ff2daa4f24e9ef1de8c665537c
	New Unity Project/Library/metadata/b3/b36535901fd3fb84cb3bb01cbe8f3787
	New Unity Project/Library/metadata/b7/b74dee9d393307244992fcc37c8f0357
	New Unity Project/Library/metadata/ba/ba793de64848e72498868233c4383089
	New Unity Project/Library/metadata/bc/bce24ab5cc237c54ea2a62738580cc6b
	New Unity Project/Library/metadata/bf/bf655fc8c815f4e4b904802c509a7f2f
	New Unity Project/Library/metadata/c0/c085e0227699c0f42a639085692eb260
	New Unity Project/Library/metadata/c4/c494c890ec8664fd9aa7d66ebfa1a7e6
	New Unity Project/Library/metadata/c7/c70041ab264c8ee43b7546b036dac1a6
	New Unity Project/Library/metadata/c7/c7823349d54534cd1b3078b6bf95c848
	New Unity Project/Library/metadata/c9/c941156ee398131428a4657e22a4ce1d
	New Unity Project/Library/metadata/cc/ccdbe19916b34a344bf5396100fea6d8
	New Unity Project/Library/metadata/ce/ced41afd62031d24c9e0bef314baa593
	New Unity Project/Library/metadata/ce/cedad172a5f2e0343a532fb984191990
	New Unity Project/Library/metadata/cf/cf9605ce45eedf94aa010247fdb8c824
	New Unity Project/Library/metadata/d0/d075e877d71806b429cf501b64930af0
	New Unity Project/Library/metadata/d1/d1b0fb1d319ebe541b1aa4a97f3dc27c
	New Unity Project/Library/metadata/dc/dc45f3c15691f124a86216b38e37ec00
	New Unity Project/Library/metadata/e1/e14df94c1bd5d475bb0fb92fefa1f00d
	New Unity Project/Library/metadata/e1/e1f50dc041f1545edbb228f8daea22a1
	New Unity Project/Library/metadata/e3/e367d2c153e215f41b217b1261153da5
	New Unity Project/Library/metadata/e8/e8e988f7a398ffc498e27b9ed17c4114
	New Unity Project/Library/metadata/ed/ed0c99ef79db44e4c8b73f78bb6b9914
	New Unity Project/Library/metadata/ee/eecc298ffb2f6004a829342be20d2154
	New Unity Project/Library/metadata/f2/f2efcffc603124d468282f9c23b8ca81
	New Unity Project/Library/metadata/f3/f325d410380336e448608f782b96b32a
	New Unity Project/Library/metadata/fb/fb643e52f206f4e429c378daa1625d86
	New Unity Project/New Unity Project.userprefs