fixed debugger
Merge branch 'master' of https://github.com/thomz12/LittleBitHeroRPG

Conflicts:
	Assets/Scenes/World.unity
	Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/00/006ee4a383efe804e87e6d10f48dc39e
	Library/metadata/07/07ac854c91668ee449157d6f3fd0224f
	Library/metadata/0a/0a8cc61e881b1c94bac9e6123baec4f1
	Library/metadata/3b/3b274736dc38b5b43890f2cda0ef40ac
	Library/metadata/41/41ac0340f30b00a48b05182b2ec7163d
	Library/metadata/4e/4ebb6be3b0600544ba434281bfd319da
	Library/metadata/53/5395a298c069e0843a2bbb65fa2cef8c
	Library/metadata/6e/6e0109b4d1d762a468c5af7067fc7ff3
	Library/metadata/6e/6e95490f93ebf5d429c6ea980c49a220
	Library/metadata/7a/7af0944d955154e468b5b829fd7f41cb
	Library/metadata/7d/7d993f565edf1ce4ba90c39ae67521b2
	Library/metadata/84/84d92f02756c3a747bb6c1786cdb1e3f
	Library/metadata/9c/9cc2fa64f8441bc49b933fdd50428cc8
	Library/metadata/9f/9faf1d5e66c6f924fb6b350bb52f4f55
	Library/metadata/a3/a34f0c28306d19043969dcf980f7592a
	Library/metadata/a5/a5df4dff7a360064cbf4e48e9df2a205
	Library/metadata/a8/a85cef8dbdb82c049b9d672022ad21d6
	Library/metadata/ab/abaa73556414f2c4ea81788d3a51b884
	Library/metadata/ac/ac60e00af4f6d1e4683976d74dd47ffd
	Library/metadata/b0/b0d56e3c3dd92094383aed2da3d32a34
	Library/metadata/bd/bdd68442c44b03441ac0d84f31142028
	Library/metadata/cc/cce061148f251274895a271185673532
	Library/metadata/ce/cefaa0ba87bd37c42889df404c3e7984
	Library/metadata/ed/ed1f16c97f1376449b29329fe2998196
	Library/metadata/f9/f94f51e270335da498fef37c3203fc59