fixed DOS line endings
fixes for strict cyanogenmod build
Merge branch 'release' of https://github.com/ravilov/AtrixBatteryFix into release

Conflicts:
	res/layout/main.xml
merged master into release

Conflicts:
	res/layout/main.xml
cosmetic changes