Syncing
Merge branch 'master' of https://github.com/livst89/jumpjump

Conflicts:
	jumping/Library/CurrentLayout.dwlt
	jumping/Library/ScriptAssemblies/Assembly-CSharp.dll
	jumping/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	jumping/Library/assetDatabase3
	jumping/Library/expandedItems
	jumping/Library/guidmapper
	jumping/Library/metadata/0d/0de3e24aa31cef442bc7de0c7019521a
	jumping/Library/metadata/17/1723df1d8c053f240913711b7ffae10f
	jumping/Library/metadata/50/5090866b143096f47abc927b4652b1a8
	jumping/Library/metadata/59/5990c19026d074c4996ef6f98c1cb750
	jumping/Library/metadata/7c/7c013faf75254114f842322fa2307257
	jumping/Library/metadata/88/8814e5a10dd30e24185a58a647d9e7b6
	jumping/Library/metadata/9a/9a10e4ba856b40f45ae4963bd4a1bc51
	jumping/Library/metadata/b7/b7e6e488a50dd6c43a7430977ba7401c
	jumping/Library/metadata/ca/ca44cc34e22ecc648b04e1bbed862e96
	jumping/Library/metadata/d6/d68bba471a4f9e34abc71f96c9d67eb2
	jumping/Library/metadata/db/db3c4ae4ffec5e045b47787e125727b9
	jumping/Library/metadata/e2/e2fd86070f7c6824d8cd9c48dc80dbc4
	jumping/Library/metadata/fb/fb516b2e2348fba44a0506f45355a7a6
	jumping/jumping.userprefs