BLE Fixes part 4

turn on Bluetooth from the dialogue, recheck Bluetooth enabled onResume.
Merge branch 'master' of https://github.com/redsky17/rfid-dog-tag

Conflicts:
	.idea/libraries/appcompat_v7_19_0_0.xml
	.idea/libraries/play_services_4_0_30.xml
	RFIDPetCollar/src/main/java/com/cse/rfidpetcollar/MainActivity.java