danyshen 339c619d7c merge develop and remove wellness tab 2 hete
..
all 339c619d7c merge develop and remove wellness tab 2 hete