merging.
Added an error code in cobalt location plugin errors
Merge branch 'master' of https://github.com/cobaltians/plugins