Update UI
Update UI
Merge remote-tracking branch 'origin/master'

Conflicts:
	EcoWalletAndroid/src/com/bmw/can2udpviewer/MainActivity.java