merge
Merge branch 'master' of https://github.com/rrafols/EcoHack

Conflicts:
	EcoWalletAndroid/bin/classes/com/bmw/can2udpviewer/MainActivity.class
	EcoWalletAndroid/src/com/bmw/can2udpviewer/MainActivity.java