housekeeping
Merge branch 'KyronetNetworking' of
https://github.com/tortal/IT2-LP1-Tendu.git into KyronetNetworking

Conflicts:
	Tendu-android/src/it/chalmers/tendu/network/bluetooth/BluetoothHandler.java
Merge branch 'KyronetNetworking' of
https://github.com/tortal/IT2-LP1-Tendu.git into KyronetNetworking

Conflicts:
	Tendu-android/src/it/chalmers/tendu/network/bluetooth/BluetoothHandler.java