Updated todo
Fixed photoset expansion
Merge branch 'dev'