Improved interop with PhoneGap + bugfixes
Removed files that shouldn't be there
Merge
Merge fixes