zadnja verzija Goran
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/Waspmote.apk
	bin/classes.dex
	bin/classes/hr/fer/zari/waspmote/ListUsbSensorsActivity$1$1.class
	bin/classes/hr/fer/zari/waspmote/ListUsbSensorsActivity$1.class
	bin/classes/hr/fer/zari/waspmote/ListUsbSensorsActivity.class
	bin/classes/hr/fer/zari/waspmote/NewGsnActivity.class
	bin/classes/hr/fer/zari/waspmote/ViewUsbSensorDataActivity$1.class
	bin/classes/hr/fer/zari/waspmote/ViewUsbSensorDataActivity$2.class
	bin/classes/hr/fer/zari/waspmote/ViewUsbSensorDataActivity$3.class
	bin/classes/hr/fer/zari/waspmote/ViewUsbSensorDataActivity$4.class
	bin/classes/hr/fer/zari/waspmote/ViewUsbSensorDataActivity$5.class

	bin/classes/hr/fer/zari/waspmote/ViewUsbSensorDataActivity$MyOnBaudSelectedListener.class

	bin/classes/hr/fer/zari/waspmote/ViewUsbSensorDataActivity$MyOnDataSelectedListener.class

	bin/classes/hr/fer/zari/waspmote/ViewUsbSensorDataActivity$MyOnFlowSelectedListener.class

	bin/classes/hr/fer/zari/waspmote/ViewUsbSensorDataActivity$MyOnParitySelectedListener.class

	bin/classes/hr/fer/zari/waspmote/ViewUsbSensorDataActivity$MyOnPortSelectedListener.class

	bin/classes/hr/fer/zari/waspmote/ViewUsbSensorDataActivity$MyOnStopSelectedListener.class

	bin/classes/hr/fer/zari/waspmote/ViewUsbSensorDataActivity$readThread$1.class

	bin/classes/hr/fer/zari/waspmote/ViewUsbSensorDataActivity$readThread.class
	bin/classes/hr/fer/zari/waspmote/ViewUsbSensorDataActivity.class

	bin/dexedLibs/android-support-v7-appcompat-a71ac89a338dd429f9fa640d754f0a61.jar
	bin/jarlist.cache
	bin/resources.ap_
	src/hr/fer/zari/waspmote/ListUsbSensorsActivity.java
	src/hr/fer/zari/waspmote/ViewUsbSensorDataActivity.java