00
updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/example/batterydiag/CurrentFileReader.java
	src/com/example/batterydiag/MainActivity.java