去除不必要文件索引
Merge branch 'master' of github.com:yongchanginfo/iBeaconIPS_Android

Conflicts:
	.idea/gradle.xml
	.idea/misc.xml
	.idea/modules.xml
	.idea/workspace.xml