updated photviewer
merge