Plane stuff
Merge branch 'master' of https://github.com/mark92/Soldier_Bob

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/guidmapper