Add shop information to the User class so that it can be saved.
Merge branch 'Adam'