update info
add basic document for functions
support plugin Entity
Merge branch 'master' into rita7
support plugin Entity location
Merge remote-tracking branch 'Rita/master' into rita7

Conflicts:
	ORM/Table.php
support plugin Entity location
Merge remote-tracking branch 'Rita/master' into rita7

Conflicts:
	ORM/Table.php