Test and merge of Cluj ThreeThree

I merged it all and made a fix together with Iraklis for BlueTooth. I test built it and made some tests. It seams to work fine.