Adding bluetooth.  Half working
Merge branch 'master' of https://github.com/redsky17/rfid-dog-tag

Conflicts:
	.idea/gradle.xml
	.idea/libraries/play_services_4_0_30.xml
	RFIDPetCollar/RFIDPetCollar.iml
	RFIDPetCollar/build.gradle
	gradle/wrapper/gradle-wrapper.properties
	rfid-dog-tag.iml