added centerwindow branch
Merge branch 'master' into centerwindow
Merge branch 'master' into centerwindow
Merge branch 'master' into centerwindow
some centerwindow-specific style fixes
Merge branch 'centerwindow'