Bluetooth changed to 115200
Merge branch 'master' of http://github.com/luxeria/mccar-sync

Conflicts:
	firmware/mccar-sync/Sources/task.c