fixed bug
Merge branch 'master' of github.com:SebRut/androidberry

Conflicts:
	classes/adbhelper.php
	classes/battery.php
	classes/device.php