Time Conversion
Some new shtuff
Merge branch 'master' into Aakash

Conflicts:

MedicalMonitor/MedicalMonitor/src/org/him/medicalmonitor/MainActivity.ja
va