DeShannon L. McGee
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/build/source/r/debug/com/mainstream/kiss_key_fob/R.java
	app/src/main/java/com/mainstream/kiss_key_fob/activity_settings.java
	app/src/main/res/layout/layout_settings.xml
DeShannon L. McGee