Nothing
Merge remote-tracking branch 'PhotoViewer/master'
bug fixed