updates trophy shelf, photo album, and inventory views. Photo album has some memory leaks. Also, fixes a small bug in User.
updates trophy shelf, photo album, and inventory views. Photo album has some memory leaks. Also, fixes a small bug in User.
resolves merge conflicts
Merge branch 'clc4-master'