save
Merge branch 'master' of github.com:haidaoxiaofei/BeaconLocDemo

Conflicts:
	.gitignore