Change-Id: Ibdb27c3a329bfde533c7af7bda0f97558d737595
Merge branch 'master' of https://github.com/zuoyebushiwo/my.git

Conflicts:
	.classpath
	.gitignore
	.project
	.settings/org.eclipse.jdt.core.prefs

Change-Id: I081daab14c8522eac5aeef6d03e73a6f2a765f0e