Makes changes to xml layouts and corresponding changes in java code
Removes merge conflicts in uart_form.xml and UartFragment.xml
Deletes nodpi images
Removes merge conflicts
Merge branch 'master' of github.com:idliitb/DAQ-Esankalan