TortoiseGitMerge: Fix a maximizing problem maximizing on a non-primary monitor

Based on TortoiseSVN revision 25046, 25047

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Update Scintilla to v3.3.7

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Applied backgroundcolors.patch

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Merge branch 'scintilla'