changes to uart and i2c on server side
integrating graph
Merge branch 'master' of https://github.com/idliitb/DAQ-Esankalan

Conflicts:
	DAQ_App/project.properties
	DAQ_App/src/com/daq/sensors/Sensor.java
	DAQ_App/src/com/idl/daq/SensorDetailFragment.java
	DAQ_App/src/com/idl/daq/SensorFormActivity.java
	DAQ_App/src/com/idl/daq/UartFragment.java
Merge branch 'master' of https://github.com/idliitb/DAQ-Esankalan