removed warnings
Merge remote-tracking branch 'origin/combine_ui_bt' into combine_ui_bt

Conflicts:
	app/src/main/java/edu/sjsu/canlog/app/backend/Backend.java