More changes to XML
Merge branch 'master' of https://github.com/aykamko/ResistorReader

Conflicts:
	bin/ResistorReader.apk
	bin/classes.dex
	bin/classes/kamkowarrier/collab/resistorreader/R$styleable.class
	bin/classes/kamkowarrier/collab/resistorreader/ResistorAct$4.class
	bin/classes/kamkowarrier/collab/resistorreader/ResistorAct.class
	bin/resources.ap_
	src/kamkowarrier/collab/resistorreader/Calculator.java

Final commit before bead. Some weird conflicts to work out.
Merge branch 'master' of https://github.com/aykamko/ResistorReader

Conflicts:
	bin/ResistorReader.apk
	bin/classes.dex
	bin/classes/kamkowarrier/collab/resistorreader/Calculator.class
	bin/classes/kamkowarrier/collab/resistorreader/R$styleable.class
	bin/classes/kamkowarrier/collab/resistorreader/ResistorAct$4.class
	bin/classes/kamkowarrier/collab/resistorreader/ResistorAct.class
	bin/resources.ap_
	src/kamkowarrier/collab/resistorreader/Calculator.java
Layout changes and code indentation