Merge branch 'dev' into new_dpf

Conflicts:
	src/modules/driver/us_proc_inst.c

diff --cc driver/device_driver.c
Simple merge

diff --cc driver/probes_manager.c
Simple merge

diff --cc driver/storage.c
Simple merge

diff --cc driver/storage.h
Simple merge

diff --cc driver/us_proc_inst.c
Simple merge

diff --cc kprobe/arch/asm-arm/dbi_kprobes.c
Simple merge

diff --cc kprobe/dbi_uprobes.c
Simple merge