added bluetooth button, no function mapped to it yet
Bluetooth compatibility check added. Also asks to turn on Bluetooth
when app is opened up if Bluetooth isn't already on
Completed light control buttons.
Completed on click listener and menu action bar.
Added multiple activities. Action navigates to Controls, Media Player,
Settings.
Pushing new changes
Local commit so I can merge with shashank's changes
Merge remote-tracking branch 'origin/master'
Had some conflicts pulling Shashank's changes, had to checkout his code
and reset it as my branch then commit the branch to master.
Completed Media Player. [Has some bugs]
Merge branch 'master' of https://github.com/tblauser/BlueHome.git

Conflicts:
	BlueHome/bin/classes/com/senior/bluehome/MainActivity.class
	BlueHome/bin/classes/com/senior/bluehome/R$drawable.class
	BlueHome/bin/classes/com/senior/bluehome/R$id.class
	BlueHome/bin/classes/com/senior/bluehome/R$layout.class
	BlueHome/bin/classes/com/senior/bluehome/R$menu.class
	BlueHome/bin/classes/com/senior/bluehome/R$string.class
	BlueHome/bin/classes/com/senior/bluehome/R$style.class
	BlueHome/res/layout/media_player.xml
	BlueHome/src/com/senior/bluehome/Settings.java
Fixed some bugs with media player layout.
Commit generated file changes so I can pull latest code changes
Second commit to be able to pull from master
Adding in the java files because I forgot to add them with last commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	BlueHome/bin/classes/com/senior/bluehome/R$layout.class
	BlueHome/bin/classes/com/senior/bluehome/R$menu.class
	BlueHome/bin/classes/com/senior/bluehome/R$string.class
	BlueHome/bin/classes/com/senior/bluehome/R$style.class
	BlueHome/bin/classes/com/senior/bluehome/Settings.class
	BlueHome/gen/com/senior/bluehome/R.java
	BlueHome/src/com/senior/bluehome/Settings.java
Recovering last successful push. Works Properly.
Deleted R.java from remote master
Deleted BuildConfig from master. Final Push.
Adding Bluetooth Code.