ScanResult files moved to characteristics folder. Advertisement corrected (to be used with app)
Merge remote-tracking branch 'upstream/master'