11
Merge branch 'master' of https://github.com/lihui157/lihui_work.git

Conflicts:
	myBox/project.properties