fix errors
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/nxn/intercomm/uartIntercom.java
fix errors