aa
Merge branch 'master' of https://github.com/lyk2112/newtest

Conflicts:
	newtest/src/configuration.xml