old version
old version
Merge branch 'master' of https://github.com/Hooksway/indoor-localization

Conflicts:
	JsonDemo/src/com/jsondemo/activity/MainActivity.java
Merge branch 'master' of https://github.com/Hooksway/indoor-localization

merge
readme.txt
update readme.txt