added avatar, cap, serial number to user data
Merge branch 'origin/master'