more updates
Merge branch 'master' of https://github.com/tonapa/raido

Conflicts:
	src/com/robot/raido/BTConnector.java