bugfix photoshow
Merge branch 'dev'

merge bugfix