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
Downgrade importance of some logging in storage
Generate .map file
Improve memory usage
Merge remote-tracking branch 'upstream/master'
log calls fixed
ScanResult improved
Merge branch 'master' of github.com:dobots/bluenet
Merge symbols that belong to same file in visualization tool
Merge branch 'master' of github.com:dobots/bluenet
Add script to get hardware version
Merge remote-tracking branch 'upstream/master'
increased heap to 3000
adjusted includes (ble_error.h has to be included after handlers.h otherwise the APP_CHECK_ERROR macro will be overwritten by the default nordic version)
(almost) all services and characteristics enabled
Disable PAN 25. In new hardware this disables LPCOMP
Merge remote-tracking branch 'upstream/master'
Update memory layout pictures
merge i think