1
Merge https://github.com/chwebteam1/OSP3A

Conflicts:
	kernel/kernel.c
Merge https://github.com/chwebteam1/OSP3A

Conflicts:
	kernel/kernel.c