debug
Merge branch 'master' into wj_dev

Conflicts:
	kernel/C_SWI_Handler.c
	tasks/dagger/dagger.c
debug
Merge branch 'master' into wj_dev

Conflicts:
	kernel/C_SWI_Handler.c
	kernel/device.c
	kernel/sched/ctx_switch.c
	kernel/sched/ctx_switch_asm.S
	kernel/sched/sched.c
	tasks/dagger/dagger.c
debu