guan's commit
Merge branch 'guanw'

Conflicts:
	project/project.properties
	project/src/main/resources/aeDescriptor.xml