adding proper android project + fixing ios project
Merge branch 'inEditor-v2'

* inEditor-v2:
  adding proper android project + fixing ios project