debug
Merge branch 'master' into wj_dev
debug
test
Merge branch 'master' into wj_dev

Conflicts:
	kernel/C_SWI_Handler.c
	tasks/simple_mutex/simple_mutex.c
	tasks/simple_mutex/simple_mutex.o
fix return value