2014/11/30 Hare Update

Hare update
Merge branch 'master' of https://github.com/Hare8563/LostPrincess

Conflicts:
	Assets/Scene/Boss.unity
	Library/CurrentLayout.dwlt
	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-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/00/00000000000000002000000000000000
	Library/metadata/00/00000000000000003000000000000000
	Library/metadata/00/00000000000000004000000000000000
	Library/metadata/00/00000000000000004100000000000000
	Library/metadata/00/00000000000000005000000000000000
	Library/metadata/00/00000000000000005100000000000000
	Library/metadata/00/00000000000000006000000000000000
	Library/metadata/00/00000000000000007000000000000000
	Library/metadata/00/00000000000000008000000000000000
	Library/metadata/00/00000000000000009000000000000000
	Library/metadata/00/0000000000000000a000000000000000
	Library/metadata/00/0000000000000000b000000000000000
	Library/metadata/00/0000000000000000c000000000000000
	Library/metadata/00/003377fc2620a44939dadde6fe3f8190
	Library/metadata/01/017ca72b9e8a749058d13ebd527e98fa
	Library/metadata/0a/0aeaa4cb29f5d4e9c8455f04c8575c8c
	Library/metadata/0d/0d1644bdf064147baa97f235fc5b4903
	Library/metadata/0e/0e447868506ba49f0a73235b8a8b647a
	Library/metadata/14/147385a70340a428ea967ae53af80b66
	Library/metadata/14/14768d3865b1342e3a861fbe19ba2db2
	Library/metadata/15/15577174a872740edb59495b6549a0c3
	Library/metadata/17/17e234879cb994b7f93d7437c10d23d6
	Library/metadata/18/186c4c0d31e314f049595dcbaf4ca129
	Library/metadata/1a/1a2e2a563e4547141a6571e3e86823c8
	Library/metadata/1a/1a549a695cd5c1745b142959716e5c90
	Library/metadata/1a/1a67c3513127f4d0699fe9d3927cab10
	Library/metadata/1b/1bb1720d01d99f740ad6aff5346b6dca
	Library/metadata/1b/1bf34b610fe6f466faff3dcd833c06f6
	Library/metadata/1c/1cac2e0bcc34e4b3cbb4bd85982eba83
	Library/metadata/1e/1e3cbdfe3644f44aeb1c053d96cc254e
	Library/metadata/1e/1e68e75546e8d4feab8846bfaf8878d3
	Library/metadata/1e/1edfae5c7fc834f76b77bee26e88e0a4
	Library/metadata/1f/1ff09dbbf00b4cf4a987dad99c5d0c8d
	Library/metadata/22/223305b2776174b23815f2b5991bcb6f
	Library/metadata/23/23ccb9b3ba8ae4468900325b52dd9133
	Library/metadata/25/257bc83cbeb544540bd0e558aa9b1383
	Library/metadata/26/26681cb0b3c2d4b049b81ddcb4ec7e54
	Library/metadata/27/273404942eede4ea1883ca1fb2942507
	Library/metadata/28/28e6d55d57fb6ff4ab198ae6163fd787
	Library/metadata/29/298297abafc3619418b26e16c0615502
	Library/metadata/2b/2b382c059b23e074fb9415cac425ca6c
	Library/metadata/2b/2b4f29398d9484ccfa9fd220449f5eee
	Library/metadata/2c/2c538784885b34a5987ed9f6651d9ecd
	Library/metadata/30/3033e46ab6c9e44a9b9dd0e9f5130357
	Library/metadata/31/31c4022adc2b22a47a4768ed1c1f1fc5
	Library/metadata/32/32569ca6b14e24176be40165ccaa300c
	Library/metadata/34/340c888f62ac4794793cbbdeafa8efd4
	Library/metadata/35/356d385a59c53487ebe6e3363ff4ffa2
	Library/metadata/39/39ab7894811cfe84bb29d19229f16608
	Library/metadata/3b/3bbbb1d2bfc4f43f79f3226bca2d1f64
	Library/metadata/3c/3c5bb2bad5622497490fdbd0f36e9674
	Library/metadata/3c/3cc8ac37e0da341db819af6143a07b03
	Library/metadata/3e/3e4384288da0d49af9743ea42e9ba196
	Library/metadata/3e/3ee3293ef13f1440da0d08786ec5cead
	Library/metadata/43/438ddd58d82c84d9eb1fdc56111702e1
	Library/metadata/43/43ca18288c424f645aaa1e9e07f04c50
	Library/metadata/44/44728a76873a64d4081b1b5b2cab8731
	Library/metadata/45/454ae1ac430d36941aff965483b1d7ad
	Library/metadata/45/459fe69d2f6d74ddb92f04dbf45a866b
	Library/metadata/45/45e20ffcccda4b74da0d3112a1fd9883
	Library/metadata/46/46e871058d317418fab60bb84a290869
	Library/metadata/47/475c4a4e617a8401b84ca7b32c7cc460
	Library/metadata/48/48a73a3747259b243bf905b98903be0c
	Library/metadata/49/494fdb9ca589cfb46953f6be7473fa06
	Library/metadata/4a/4afc5851ead2f0145b63605d410f70a2
	Library/metadata/4c/4cd7de7b6c837e94881dd4ab6cce0eec
	Library/metadata/51/510306bf62c654a548c9d0193dbedd8e
	Library/metadata/52/527393b10fb66418bbaa072e104f5a30
	Library/metadata/53/53b3960ee3d3d4a5caa8d5473d120187
	Library/metadata/53/53b84fa638a5d494a8fa213980b15245
	Library/metadata/54/54216e9ed42974e30967824b7f0b2806
	Library/metadata/56/562f620336e024ac99992ff05725a89a
	Library/metadata/57/5710a1f47af2947699139509aae39149
	Library/metadata/57/57b33a14b6d5347c5a85c36f6cb3b280
	Library/metadata/57/57cdacf9b217546aaa18edf39a6151c0
	Library/metadata/57/57e6deea7c2924e22a5138e2b70bb4dc
	Library/metadata/58/58a97748560b74d4e8c184f572b9a3c5
	Library/metadata/58/58ff37c80576ddf41a8eaef951ae5dff
	Library/metadata/59/593274be8fb844d3f96398f0c896af57
	Library/metadata/59/5961e290382cc0140bc08293a37530fe
	Library/metadata/5c/5c5d0f7902e35a4409363f2b373bc723
	Library/metadata/5d/5d7f4c401ae8946bcb0d6ff68a9e7466
	Library/metadata/5f/5f32776e6f3e6464191e1cc146b4eaf5
	Library/metadata/60/607426a9820414bfd8081fb22854dbd4
	Library/metadata/61/6134a184b1d49498fb473b6276533784
	Library/metadata/62/627943dc7a9a74286b70a4f694a0acd5
	Library/metadata/62/62a3b03a3be272b42990ab27451c5d7f
	Library/metadata/62/62bcade1028c24ca1a39760ed84b9487
	Library/metadata/63/63e618e4b55634c8fb3bf5c5cd6679ea
	Library/metadata/64/641b781cad112c75d0008dfa8d76c639
	Library/metadata/66/66207ff69de6b4d73a445036c3a195f6
	Library/metadata/67/67f8781cad112c75d0008dfa8d76c639
	Library/metadata/68/68a00c837b82e4c6d92e7da765dc5f1d
	Library/metadata/69/69a88240a66c648499b9e8af51562f0e
	Library/metadata/6a/6aa58ee2f84094af2846e1a7bb0c23f9
	Library/metadata/6c/6c4ea9ec65e824364b9f6e5de6e9dfc2
	Library/metadata/6d/6d55b5e91b95c41739cdf4f804dd383d
	Library/metadata/6f/6f1418cffd12146f2a83be795f6fa5a7
	Library/metadata/70/708b781cad112c75d0008dfa8d76c639
	Library/metadata/70/7097f369c5ba74821bd76c430889322a
	Library/metadata/70/70d8568987ac0499f952b54c7c13e265
	Library/metadata/73/73604ae94aea741dfa9b7732c8994b19
	Library/metadata/73/7379e478daa6c1545ba557b247c82930
	Library/metadata/75/754b290d27cfdfa42a70a711df5b6692
	Library/metadata/76/763f3834a61954241955baf7c300c5d2
	Library/metadata/76/7699c5fbfa27745a1abe111ab7bf9785
	Library/metadata/78/7856cbff0a0ca45c787d5431eb805bb0
	Library/metadata/7b/7b12154f1f26644e0bc0db89ad02b845
	Library/metadata/7e/7e0b0a994d8934541a387e092630b5db
	Library/metadata/7e/7e6f84bf81c8d4de280f1133cff7e601
	Library/metadata/81/8169b9fcda6632d438dcc587de00309f
	Library/metadata/81/81e8e3825a0a9eb4293a6e15475512e0
	Library/metadata/82/8269a010592f549af8f11b1683d9e794
	Library/metadata/83/833bb81c6130a4d16a4dcacda0b32c3b
	Library/metadata/84/849a560f661f5df45bb1d3aff311a4a8
	Library/metadata/85/85a88efa8c871af4a9d17c64791b6f4f
	Library/metadata/85/85cde262bee344ae28a0bf86762219ac
	Library/metadata/86/86d05af49dbb6ce41afc978ad72dff2a
	Library/metadata/87/874ceab4425f64bccb1d14032f4452b1
	Library/metadata/8a/8aaff0751054e4a9cb4642d01eaf5be9
	Library/metadata/8a/8af0f21f411904d65a90f87110818a7e
	Library/metadata/8b/8b30686bb4322ab42ad5eb50a0210b58
	Library/metadata/8b/8b6264f463e70a1439150c77cdce8832
	Library/metadata/8b/8b8f89441611d8148ad93feb61d8c780
	Library/metadata/8c/8c1f929571ef549619212d9405d4f923
	Library/metadata/8c/8c75dadc1f18e42f5be29942a71d83c4
	Library/metadata/8c/8c81db0e527d24acc9bcec04e87781bd
	Library/metadata/8d/8dbd7dc1f598f9c44b214e19bc04ec40
	Library/metadata/95/9553bccd19c33214eacf59635d8e0af0
	Library/metadata/95/95616c020c5604dda96cf76afbbc0272
	Library/metadata/95/95ba37c38adba104f90f8dd72f6b4dec
	Library/metadata/96/96ca71e39c7b6fb4f9bec2c5bf331349
	Library/metadata/97/9734dafa47c4d4ed6aef633a3967647f
	Library/metadata/97/97bf4299c086fc049bb009fc5a2012a8
	Library/metadata/98/987fb0677d01f43ce8a9dbf12271e668
	Library/metadata/98/98cd9e334b611ea48984769320690860
	Library/metadata/9a/9a59d4872d73b416f8e0c2c4ca57fbe2
	Library/metadata/9a/9ad381ed8492840ab9f165df743e4826
	Library/metadata/9b/9b9106e5cf82342e78e4fcc288becd41
	Library/metadata/9e/9e42fe7b745a6ce489675b2fdf1c9e7c
	Library/metadata/9e/9ef50104b12ed4ca9bed40f105986cd7
	Library/metadata/9f/9fadc0eecbffa4c95a05ce54af27726c
	Library/metadata/a4/a40c1b84cf7fe418bae97a29041b85a4
	Library/metadata/a4/a44a1861be2805742bde2650b08602ce
	Library/metadata/a4/a48dcec6d1155b14aa054e33680dfddd
	Library/metadata/a7/a70c4926dcd2ad241ac4e1f5f6a04fe7
	Library/metadata/a7/a771af3b1958445078af5fe2e9ec726c
	Library/metadata/a7/a7f0d5668c1dc6f4383083ed8e3c0d15
	Library/metadata/a9/a9df009a214e24a5ebbf271595f8d5b6
	Library/metadata/aa/aadd99b5f57c2486b98d31bcbb5c640e
	Library/metadata/ac/ac865f55780124eeabc4a99d6d0b0115
	Library/metadata/ac/acd613035ff3e455e8abf23fdc8c8c24
	Library/metadata/ae/ae162c0523ab4468bb03ef160eb672e2
	Library/metadata/b0/b0249d8c935344451aa4de6db76f0688
	Library/metadata/b1/b1482ab6621ab6e4a878a08e209523b4
	Library/metadata/b1/b14b79b8936134d3f8238f0c2d40d634
	Library/metadata/b2/b2145489f7c704db8acb14a52bddeee9
	Library/metadata/b3/b365e6042890d4b1987423ed6bb8a08c
	Library/metadata/b3/b3728d1488b02490cbd196c7941bf1f8
	Library/metadata/b5/b59984d82af624bd3b0c777f038276f2
	Library/metadata/b5/b5b8c0f9acc2944f086c02cb83f4ae76
	Library/metadata/b6/b61f0d8d8244b4b28aa66b0c8cb46a8d
	Library/metadata/b6/b6aa781cad112c75d0008dfa8d76c639
	Library/metadata/ba/bac9d05e465fb944284b53eba5133de1
	Library/metadata/bb/bb4af680337344a4abad65a4e8873c50
	Library/metadata/bc/bcb2bd9aac01d4804bcdcf61ac46b224
	Library/metadata/be/be3b6a6495f5d92478698604645f5123
	Library/metadata/be/be6e39cf196f146d5be72fbefb18ed75
	Library/metadata/be/befbb4b9c320b4b18a08ef7afb93b6c9
	Library/metadata/bf/bf34d2a25450349699e8ae6456fa7ca9
	Library/metadata/c1/c182fa94a5a0a4c02870641efcd38cd5
	Library/metadata/c2/c22094bc116524b2a95c9aae09278b22
	Library/metadata/c4/c4815e5c81462884fb282c40fa04d8b0
	Library/metadata/c5/c547503fff0e8482ea5793727057041c
	Library/metadata/c6/c60d549d7b8ffdd479e6bedd2605e659
	Library/metadata/c8/c80e5d05624da02478e90af7ca3d29cc
	Library/metadata/c8/c81df2918c80c054ca3d436e62090893
	Library/metadata/ca/caa1ec025a7c049ec8f67b889fb33a6d
	Library/metadata/ca/cad4fe3deabb0452e9a372244c25287c
	Library/metadata/ca/cafed2e10781ca8439392fc614b053c3
	Library/metadata/cb/cb2e104c6d385034abd5cce3d789d95b
	Library/metadata/cb/cba4562cece794697b418ce8e7c04b3c
	Library/metadata/cd/cd5b323dcc592457790ff18b528f5e67
	Library/metadata/cd/cd734e65233e9453a95e40afdd6db33e
	Library/metadata/ce/ce0cb2621f6d84e21a87414e471a3cce
	Library/metadata/d3/d3b1c8c1036784176946f5cfbfb7fe4c
	Library/metadata/d5/d5396a3251db948279e0c7262385dafe
	Library/metadata/d6/d6e0c95a128e14227939c51b5d9ad74e
	Library/metadata/d6/d6ef58fc6f637406bbe6814a19c377f8
	Library/metadata/d8/d8019381d6fb7be49a74e26f0d18ac88
	Library/metadata/d8/d8e82664aa8686642a424c88ab10164a
	Library/metadata/d9/d9cccf980fcb7441d85b8b3b5c2d2c34
	Library/metadata/da/da310021e2a4142429d95c537846dc38
	Library/metadata/da/daf8ab28ea6df4773bf38cb9e3e173e1
	Library/metadata/da/daf9781cad112c75d0008dfa8d76c639
	Library/metadata/df/df42ef794d3e0441783057cf822a525c
	Library/metadata/df/df47b1bd78b292c4ca0478733f46813d
	Library/metadata/e0/e02bf8d8fe18948ea8ce546b6a32bee5
	Library/metadata/e2/e2baf3cae8edc4daf94c9adc2154be00
	Library/metadata/e5/e515e0f94cefc4c0db54b45cba621544
	Library/metadata/e5/e53c8c3dcc4ff59438bc9e86cb45c3f6
	Library/metadata/e6/e62608c29e73cd341a23600046734749
	Library/metadata/e7/e70b47c0cfc1d4b12a3c663d7582a523
	Library/metadata/e8/e83c2f831bb0fd14b92751cdcbe823ec
	Library/metadata/e9/e97c14fbb5ea04c3a902cc533d7fc5d1
	Library/metadata/e9/e9b2eead3d2f84ce19c1d65f1dbf66f9
	Library/metadata/e9/e9ba2083ad114a07d000fbfb8d76c639
	Library/metadata/ec/ec1102bfbb8092e42a3f9a52d8317fe0
	Library/metadata/ef/efa9ad06e482bf841b2f01617384a16a
	Library/metadata/f1/f1b13d7a80660504a858ea24cfa418c6
	Library/metadata/f2/f2af333648c334319bd43c214449ab50
	Library/metadata/f4/f4901f25d4e1542589348bbb89563d8e
	Library/metadata/f5/f58445347fe2e4b8396487ed2bfa02ad
	Library/metadata/f6/f688f89ed5eb847c5b19c934a0f1e772
	Library/metadata/f7/f781c091d1c8647c380d5230adfaee54
	Library/metadata/f7/f7898d203e9b94c0dbe2bf9dd5cb32c0
	Library/metadata/f9/f9372f23586ef470b97d53856af88487
	Library/metadata/f9/f9d5fa183cd6b45eeb1491f74863cd91
	Library/metadata/f9/f9f885e316054964da337bf948cf057f
	Library/metadata/fa/fa5225bbb4794f0449d1fcf9c06ec6fc
	Library/metadata/fb/fb52973118cf00648825ced2fcca240c
	Library/metadata/fe/fe5d00245bc1d42a7927f4b2879026b8
	Library/metadata/fe/feb71edfa8992fd45bb8f4462c58779c
	Library/metadata/ff/ff063c9db7e6e467d86d376ff5be5ca0
	Library/metadata/ff/fff2b55a12d7242f29bcc8a0acb38b5d
	Library/shadercompiler-1.log