[fixed]: missing string file for en language
Merge branch 'master' of https://github.com/668Jerry/1129ios into watersu
[added]: new image resource for VShop pin
[added]: to load vshop from parse server vshop table and store into coredata (will only load newly updated data after first load)
[modified]: disable inApp purchase setting in proj file
[modified]: remove some useless code
[modified]: retrive vshop data from parse server everytime when user open 補給據點 view
[modified]: keep vshop last update time using get time but not received time
[modified]: increase dumped coordinate precision
Merge branch 'watersu' of https://github.com/668Jerry/1129ios
fix merge mistake
Merge branch 'master' of github.com:668Jerry/1129ios
Merge branch 'novel1'
SUP km