will merge.
Merge branch 'master' of https://github.com/tearsofphoenix/scintilla

Conflicts:
	cocoa/ScintillaFramework/OakAppKit/OakAppKit/src/NSColor Additions.m
	cocoa/ScintillaFramework/OakAppKit/OakAppKit/src/NSView Additions.m
	cocoa/ScintillaFramework/OakAppKit/OakAppKit/src/OakImage.m