Made additions to Measurent.java and TeleCareDataSource.java
Merge remote-tracking branch 'origin/master'