11
Merge branch 'master' of http://github.com/lujunqi/LoveBabies

Conflicts:
	AndroidManifest.xml