Add username
Merge branch 'photos_and_sets'