Merge pull request #37 from piaw/master

Merge pull request #15 from xiaoqin2012/master
add DHA/EPA tracking
Merge remote-tracking branch 'origin/master'
Merge pull request #38 from piaw/master

Add activity level and height selection
clear profile data when updated; polish profile save function.
Merge pull request #16 from xiaoqin2012/master

merge from xiaoqin