[MOD-1492] iOS Map module will be used if Ti.Map doesn't exist
[MOD-1492] Forcing the Android build scripts to include Ti.Map
Merge pull request #140 from jonalter/MOD-1492

[MOD-1492] iOS Map module will be used if Ti.Map doesn't exist
Bumping KS master version to 3.3.0
Resolving conflicts