Merge branch 'master' of https://github.com/cobaltians/plugins
Web side update for location plugin
Merge branch 'master' of https://github.com/cobaltians/plugins