add intelligent headset
Merge branch 'master' of https://github.com/ychen022/intelliguide

Conflicts:
	AndroidManifest.xml
	project.properties
	src/srb/intelligent/intelliguide/MainActivity.java