Merge branch 'personalinfo' into friendlist