changes in contents
updated new staffs and icons
Merge remote-tracking branch 'origin/master'