query support function callback
update gitignore
Merge branch 'master' of https://github.com/hefangshi/fis-kernel

Conflicts:
	package.json