Smarter way to parse xml
Merge branch 'master' of github.com:imkevinxu/totoro

Conflicts:
	android/InCarDisplay/src/com/totoro/incardisplay/TelnetClientOutput.java