Modified Bluetooth class
Merge branch 'test' of github.com:PDSD-2014/parvu-traistapopescu into test

Conflicts:
	PDSDTest/src/com/example/pdsdtest/Bluetooth.java
	PDSDTest/src/com/example/pdsdtest/MainActivity.java