merge from Haoxing Chen

Changes to be committed:
	modified:   API/uarm.c
	modified:   API/uarmctrl.c
	modified:   API/uarmctrl.h