ADD: api framework
Merge remote-tracking branch 'origin/xhf'

Conflicts:
	.gitignore