pull
Merge branch 'master' of ssh://git@github.com/xjy2061/bp.git

Conflicts:
	beautyplan/project.properties
Merge remote-tracking branch 'origin/master'