Fixed problem of cells having different heights in my account page
Merge remote-tracking branch 'origin/develop' into develop
Solved conflict with the project file
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	gbk/GBK.xcodeproj/project.pbxproj