Merge code
Merge branch 'master' of github.com:xuse/ef-orm

Conflicts:
	common-orm/todo.txt
remove temp file.