BTService Created, but not yet correctly working.
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	src/edu/usf/csee/heartbooth/gui/MainMenuActivity.java