added company identifier to manufacturing data in advertisement package
Merge branch 'master' of github.com:dobots/bluenet
removed virtual from function definitions in ScanResult.h
Changed to characStatus definition in IndoorLocalisation
added initialisation of characStatus capacity
Merge branch 'master' of github.com:dobots/bluenet

Conflicts:
	include/services/PowerService.h
	src/services/GeneralService.cpp
	src/services/PowerService.cpp
Merge branch 'master' of github.com:dobots/bluenet

Conflicts:
	src/services/GeneralService.cpp
	src/services/IndoorLocalisationService.cpp
Merge remote-tracking branch 'upstream/master'