修改个人信息界面
Merge branch 'master' of https://github.com/SYSUsmartlife/smartlife

Conflicts:
	SmartLife/.gitignore
Merge remote-tracking branch 'origin/master'