Added android studio compatibility
Updated some files