[NO CODE CHANGE] resolve conflict
Merge branch 'master' of github.com:napon/WiFinder

merge branch to resolve confilct
Testing http cache