Signed-off-by: liaosiwe <liaosiweiorxiaowei@gmail.com>
Merge branch 'master' of https://github.com/hust/pingjia_repo_dev.git

Conflicts:
	.settings/org.eclipse.core.resources.prefs