aa
Merge branch 'master' of https://github.com/eggine/Adolb

Conflicts:
	开发文档.doc