test commit
test merge
test2
Merge remote-tracking branch 'origin/jing'

Conflicts:
	abc
(1) Changed Calibration Module from using service to activity.
(2) Used Weka provided API to construct ARFF file instead of Java.IO
(3) Added Android Plot to display the acceleration data
I am Still having issues with the bin distribution resuls.The bin distributions
are all shown as zero.
Fixed home page gauge sizing problem.
Fixed crash after entering food data in diet entry page.
Fixed unstablility and added dialog box upon click confirm from diet
page
Merged with Shenglan's Changes
(1) Changed Calibration Module from using service to activity.
(2) Used Weka provided API to construct ARFF file instead of Java.IO
(3) Added Android Plot to display the acceleration data
I am Still having issues with the bin distribution resuls.The bin distributions
are all shown as zero.
(4) Added *.log to gitignore file
Merge branch 'shenglan' of https://github.com/zzzj15/senior_design into shenglan
Fixed the issue with Bin Distribution. Experiencing some problem with Peak Detection. Many of the sensor data come in the same, not suer if this is an issue
Merge remote-tracking branch 'origin/shenglan' into jing

merge changes for binned distribution to work.
Disabled plot after timer expires. Fixed arff file dump data rewrite problem.
adjust peak detection threshold.
fixed data capture not started on button click. Peak detection is not blank now.
added arff file merge for running and walking.
commit all changes before merging.
adjusted threshold to be relative when range is large and absolute when range is small. set screen to be ON when calibrating.
added sitting in calibration.
commit changes before merging.