.
Merge branch 'wl' into gpdevelop

Conflicts:
	KBLove.xcworkspace/xcshareddata/KBLove.xccheckout

KBLove.xcworkspace/xcuserdata/block.xcuserdatad/UserInterfaceState.xcuse
rstate

KBLove.xcworkspace/xcuserdata/block.xcuserdatad/xcdebugger/Breakpoints_v
2.xcbkptlist