fixing some stuff
Merge branch 'development' of https://github.com/QuasimodoNZ/Bluno-WaiNZ into development

Conflicts:
	BlunoBasicDemo/src/com/example/wainzbluetooth/HistoryAdapter.java