Changed module name from xbmc to xbmcjson to avoid name collision in scripts or add-ons
Merge branch 'master' into renaming
Updated import