Bluetooth fixed
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/tom/stapp3/activity/ConnectionView.java
	app/src/main/java/com/example/tom/stapp3/driver/ShimmerService.java
	app/src/main/java/com/example/tom/stapp3/persistency/DatabaseHelper.java
	app/src/main/res/layout/connection_view.xml