obstacle layout changes
Merge branch 'master' of https://github.com/Helgemonster/CritterSpin

Conflicts:
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Assets/Scenes/NordiskSpilldag_Level.unity
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/ScriptMapper
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/04/04d5a0bfc3407f647874304f8f765f47
	Library/metadata/07/077eb61f59cd94340900d338beb3f940
	Library/metadata/07/07ffb0e5c9c41694a8b1bdd883baba0a
	Library/metadata/08/08ca19b6a42028b4baccd36a16c0e37b
	Library/metadata/0e/0e1b811169894014297476f56ede00f6
	Library/metadata/0e/0e473cceeb207734b88f1612f974c9df
	Library/metadata/0e/0ea27b07d540d43d59ae1e47ca34acd3
	Library/metadata/11/11612693463b5c2498b9e3134794bf2b
	Library/metadata/14/1445b5c4c9dda45f8aa85c50ca683e5f
	Library/metadata/19/1916bf80015438847a1e3189822fbd25
	Library/metadata/1a/1a746b3b6c82e6c448ec5b81d35a9e2c
	Library/metadata/1c/1c70d0038c4bd09488d4b8eeebcb53f0
	Library/metadata/1c/1c763339a2a474480aca177df36eaad8
	Library/metadata/1c/1cf81f3747271cf468b4b2a64013d019
	Library/metadata/1d/1d5394da2c7536f4a9ac73b0b6d9ae30
	Library/metadata/1e/1ea5aa067530ea740a45745307edc7a5
	Library/metadata/23/2340f4416d3a82846871f586288fd092
	Library/metadata/23/236bd1bdb66619d4bb544ca1555cf541
	Library/metadata/23/2374452c65ae78e4996bd910d37963b3
	Library/metadata/25/25775b9f26a917549b115bde30c501ee
	Library/metadata/25/2585ec5e96706694ea01753f941c9a6d
	Library/metadata/25/25fb28b77ce6f47878e1150caf9bbe82
	Library/metadata/28/2883ae22201c74f2c932106edb8b274d
	Library/metadata/29/2941b6c073a700b4d9cf4dbc124edf5c
	Library/metadata/29/295212115d2c73d499ba88d7acc85dc1
	Library/metadata/2b/2b0dcf8f485b41a4b9a7093a74670a3d
	Library/metadata/2b/2bfcacc4592fc3b44ae120e93240a4d1
	Library/metadata/2c/2c5b10efd9324d24bb17ad2616f0910b
	Library/metadata/2c/2c78263d692d547a2b49df06f6678983
	Library/metadata/2d/2d2a5515af618f848a6eb912df185c8c
	Library/metadata/2e/2ee848db70db8284e89a281fae81ae13
	Library/metadata/2f/2f43e13a4a398354cb2cd8e20b525fd4
	Library/metadata/2f/2f71a13465db73a44b52d57604d04267
	Library/metadata/30/308eca2f1ccae8b408a2c1d286e5a99c
	Library/metadata/33/33a69add632d8384496d7a6722fe5f46
	Library/metadata/37/373af2f2e5c174b999a98ee61a75d419
	Library/metadata/37/37846a5b978924760966eb5f3a328d14
	Library/metadata/39/39e2b26d8d2239e46ab1c229ba266de6
	Library/metadata/3c/3c79a48706628104cafd4296de6865a4
	Library/metadata/3f/3f2b04947bf42b1429aef4c812b00d34
	Library/metadata/40/40aef52c0b088de49b29aea6cf894912
	Library/metadata/43/433933b77062479419baa77bd5e4324d
	Library/metadata/45/451ae948b9d383e4fa8774ed641f800f
	Library/metadata/46/4634b37b0a6c5eb42be3ccde463384db
	Library/metadata/48/4802c17a93338d44a9fb68f38cc693f2
	Library/metadata/48/48dca5b99d113b8d11006bab44295342
	Library/metadata/49/4938975655d387f4b8459b4c6412ccd2
	Library/metadata/49/49f6c54fb33c58644a32e912fb2d0254
	Library/metadata/4b/4b8b2d7b21607a44db34ae7a407a18a0
	Library/metadata/51/51017ff7edd631148b5e1085c1feb969
	Library/metadata/54/54f199f3f70afac41ac07a2264f67ccb
	Library/metadata/56/56142b809e23e4c4c813c61c53304c28
	Library/metadata/56/56f2cf46adfce2a4a83653d6a8014c47
	Library/metadata/57/57d07b86d64bf8a47b53b345cb71b91a
	Library/metadata/59/59b966ec2951d304e88f24cf5add9ba9
	Library/metadata/5b/5b00a4a1fffc3194781bdeb8cb7e4a6f
	Library/metadata/5d/5d7da2a2fa096194a97a3eb3f7cf20d1
	Library/metadata/5d/5da39acecafc32d46b3b32f783774eb1
	Library/metadata/5e/5e3983a47c43778429ff1180235e4d8a
	Library/metadata/5e/5e996cef2fce1704990834affda07627
	Library/metadata/5e/5e99a1bae6c46a34795db561a3f370a2
	Library/metadata/5f/5f1c6b9eaa6c3334491567bda6e67369
	Library/metadata/5f/5fcd087aba105d94c8189ffd2ef4d2af
	Library/metadata/60/60bceeafe6aceca4c85a757b5af3a60d
	Library/metadata/63/63e0517511ffb3d478792b781da49491
	Library/metadata/66/66ae3c505c2d1407abce312940f306c3
	Library/metadata/6c/6c7e74de55b654abeaec7369b79032a1
	Library/metadata/6d/6d7d417d6184a83469a09f0f618c0e36
	Library/metadata/6d/6dfd7061b759eaf4c93ada0fd0d16107
	Library/metadata/6e/6e43ab0df2fa27148b5297e1c3c84d80
	Library/metadata/6f/6fcbc842ca0165444b0d42fcc670a573
	Library/metadata/70/706e635d6a789f84da59f682c425976a
	Library/metadata/71/7103b99063f25475b90b06d9e57b9f98
	Library/metadata/71/711c8c858546e934baa87dd3b080d454
	Library/metadata/71/71a0c771c49034494ba9bbb822bfa46e
	Library/metadata/72/7265cc6dd73d82443afc5f15f493a359
	Library/metadata/74/74acdbbdb74794f8689262d5c061d626
	Library/metadata/74/74ad47bc958334e87b1e42f9b219aee0
	Library/metadata/75/7596e46bb4f794b4098e0f5712cba153
	Library/metadata/76/76b732a16caf03d459c6a34ba7734c2c
	Library/metadata/77/771f02929d76e438e93dc18f0da62598
	Library/metadata/77/775553d0d860bc44a9a91d09b1d1ee38
	Library/metadata/77/77fec0f321a8f7c4b87ad5288e1eb7eb
	Library/metadata/78/786742a21c71dc645823a44a5551ad9c
	Library/metadata/78/78779030fc0534ce19030904c523fab9
	Library/metadata/7a/7a82b83ce445b46439090158da6bb206
	Library/metadata/7d/7d37f87cf4552234b9fec5f1cc3b5fd1
	Library/metadata/7d/7da28a6e77bce624e9f88104f643a592
	Library/metadata/80/8026a05d53697d648bc04707bc24ed6a
	Library/metadata/80/80522ffb210b3ab42979294d882ce899
	Library/metadata/84/847a2b4c9e8c46d44a4b87c86dc1baa2
	Library/metadata/84/84b38702d5392c644856e22d06e63948
	Library/metadata/85/851f4666c7c4ce4468f294d9d37d6882
	Library/metadata/85/8536b4057edf048888d27f7fbe7e19da
	Library/metadata/86/8601ca056089cc94f8bc5bdde483c279
	Library/metadata/86/86a558903d2b5984b89e555e3247ae7e
	Library/metadata/87/875a97235d15a4144894590d1fe2560c
	Library/metadata/88/8859657c4e8649e4f8ae830e341de2cc
	Library/metadata/89/890f46fe3b6c2a44f8328a0c9097b1e9
	Library/metadata/8c/8c7ae70e28df1764ebcc50a1fbec3a55
	Library/metadata/8e/8e17b3b7659794d2abe57bf87e106686
	Library/metadata/91/91e252f09335bd847b2852e92470908f
	Library/metadata/92/9244764b2bb33604290366f02ab7d931
	Library/metadata/98/98b8fc0f47e62d84089f5cb45c77d025
	Library/metadata/98/98cde9db7aa424f8f8659ea230a305ce
	Library/metadata/9c/9c14f29507ddc8f45be3064c12e9c82e
	Library/metadata/9c/9ce107479d11178d11005b9844295342
	Library/metadata/a5/a57732311bac00d49b28c72bbeeaf35e
	Library/metadata/a5/a5a82c902650f7c43a23aa91f35c35c6
	Library/metadata/a6/a661bc80685bd7742874dc2264dc795c
	Library/metadata/a9/a995f9ffba54346408e8aa422880c03b
	Library/metadata/a9/a9b374e1c8497d44ea13a79195d182c7
	Library/metadata/aa/aa4580794e7ade541aad0e72a8936412
	Library/metadata/ac/ac870498dbcb11648845718509da7557
	Library/metadata/ac/ac9730716dfb2f84d92dea7411b00d01
	Library/metadata/ae/ae6408378aa174e5ebbc45a81d565244
	Library/metadata/b0/b0c95b89bb4b519438072567cf3c0ba1
	Library/metadata/b1/b1240db8bb2a74fce8b2f060a77ea706
	Library/metadata/b4/b4807f75ce073af4781a51563a4442c7
	Library/metadata/b8/b8ab5e8818d4ce84db6dcd2be72f9124
	Library/metadata/b9/b9565420e07be364db83bf065662b6bd
	Library/metadata/ba/ba438a9bc1e6a484396c50d9cef5a5d7
	Library/metadata/ba/baf230a2cb6d22c43b6e3369bea9678c
	Library/metadata/be/be1c94eac27bceb4abf1a9bb66b6ebeb
	Library/metadata/be/be48dbe213942e0448f86de3a4089bee
	Library/metadata/be/beec37d628382b746b35b8458250c0e6
	Library/metadata/c0/c0b479fe243ab394294abee215130c50
	Library/metadata/c1/c177e3738b1c8bb47881223aa3713224
	Library/metadata/c4/c413918efb7eb4aaa93ad99f5fb9c64c
	Library/metadata/c6/c66b143644a6c4ab8aff1fccdc099ea9
	Library/metadata/c6/c68657459d2166e45a09d2a91c35646c
	Library/metadata/ca/cac7f20dc192222458d9e95327b50756
	Library/metadata/cd/cdb03adc1709361418bab9dbd934b646
	Library/metadata/d3/d398064deffa94d05a443fdac71477d7
	Library/metadata/d5/d5890631e13a915489f07f80ac575d86
	Library/metadata/d7/d7a98b5c293729544aa7757aecbc5fcf
	Library/metadata/d8/d84268709d11078d11005b9844295342
	Library/metadata/db/db860e1c2a714436290f6533300d491b
	Library/metadata/dd/dd0d8afb63030c048be97f66687c9b82
	Library/metadata/de/de2d25ffef978479393f498c6fba7bef
	Library/metadata/de/dec20ea39c77df64bb5fef290724336d
	Library/metadata/df/dffcc8dcb6ca94543b9e563454a258c4
	Library/metadata/e1/e1198d531e0de9149b5a69631f8a1746
	Library/metadata/e1/e17d3ea87dc1d504db6d6363cfe5d785
	Library/metadata/e1/e1eff43ee9cb95c47a0f5f1df5028bce
	Library/metadata/e5/e5015c1313972914eb4f599a2ef4c604
	Library/metadata/e6/e61ceb00612828740a0835f487e46d61
	Library/metadata/e9/e92e3bdf96b09b3498d0ea8154953461
	Library/metadata/ea/ea080482ff310864e87f96a7b269aa33
	Library/metadata/ea/ead0e8b8df0576f4599aecfb91ab6cbe
	Library/metadata/ec/ec619e980f4fc5c4b85a1bcd0355b43c
	Library/metadata/ed/ed73e18de01f5024eb783a1e0566d17c
	Library/metadata/ed/ed9d5cacffb3f2f42baaa2b5aec066a7
	Library/metadata/ee/ee001ec6f22c1254f98b52051fd0d790
	Library/metadata/ef/ef9b7c7ec3ec94a4289f4f2091e6cbc3
	Library/metadata/f0/f0e1325b510ccff45ab966c5ca54d309
	Library/metadata/f3/f37b20770c6b273498a240663271d537
	Library/metadata/f3/f384c73f7b88eb7488c34fbedd466f57
	Library/metadata/f3/f3ad0a3dc14ff410aa0518973583eb7e
	Library/metadata/f4/f43e8d84800203147908c04c45bfe9fe
	Library/metadata/f9/f901d1524daf751428b685b430bbd4f7
	Library/metadata/f9/f9b5c9b3f565b104c88a6d4244d668cd
	Library/metadata/fb/fb7b4eb7738663d4389f3225555e9090
	Library/shadercompiler-1.log