个人资料页
Merge branch 'master' of https://github.com/iOS-Programmers/Shaping

Conflicts:
	Shaping/Controllers/MineViewController.m
	Shaping/Controllers/MineViewController.xib