changed api
api changed (fix)
cherry pick api
Merge branch 'master' into ManagerClasses

Conflicts:
	QAServise/doc/api.md
correct extends
organized imports