blue window added
Merge remote-tracking branch 'adminrepo/master'