修改圖片顏色以及按鈕的顏色
Merge branch 'master' of https://github.com/newtonstudio/healthstyle

Conflicts:
	habalife_project/Base.lproj/Main.storyboard
	healthstyle.xcodeproj/project.pbxproj