removed unused HIJavaBridge class
fixed imports
use instancetype instead of id where appropriate
Merge branch 'master' into payments