at 11:23
Merge branch 'master' of https://github.com/HangtaiMedia/KS_HTM_MaxLife

Conflicts:
	MaxLife.xcodeproj/project.pbxproj
	MaxLife.xcworkspace/xcshareddata/MaxLife.xccheckout