timob-7502: comments addressed
Merge pull request #2938 from hieupham007/timob-10710

Timob 10710: Add 'persistent' property to AlertDialogs
timob-9447: added images for xhdpi devices.
timob-7502: comment addressed.
Merge pull request #3021 from hieupham007/timob-9447

timob-9447: Incorporate tableViewRow images for xhdpi devices.
Merge pull request #3007 from hieupham007/timob-7502

timob-7502: iOS- Change 'time' property in sound to milliseconds
[TIDOC-794] Explain current autocorrect behavior.
[TIMOB-11045]Using the appropriate splash screen for iPhone 5
Merge pull request #3023 from srahim/timob-11045

[TIMOB-11045]Splash screen fix for iPhone 5
[TIMOB-10846]reload webview on iOS 6 
Merge pull request #3024 from srahim/timob-10846

[TIMOB-10846]iOS 6, reloading webview after reloading data.
TIMOB-11044 className needs to be a method, now.
Merge pull request #3026 from BlainHamon/timob-11044

TIMOB-11044 className needs to be a method, now.
Convert JSONObject.NULL to Java null value.

This fixes a crash seen by not properly converting
JSONObject.NULL objects back to Java nulls.

This will lead to a crash once the KrollDict is converted
by Kroll since it does not known how to convert JSONObject objects.

[TIMOB-11055]
Merge pull request #3020 from bryan-m-hughes/timob-10955

Timob 10955 Windows/Linux compatibility
[TIMOB-8652] Added CLI hooks for Android and iPhone. More work on the iphone build command.
Merge branch 'master' of github.com:cb1kenobi/titanium_mobile into cli-timob-8652

Conflicts:
	support/node_modules/titanium-sdk/lib/titanium.js
Merge pull request #3030 from cb1kenobi/cli-timob-8652

[TIMOB-8652] Titanium CLI Merge
Add webviewFireEvent test in ui suite.

[TIMOB-11055]
Fixed urgent issue where git show was printing version using colors that was causing scons incorrectly parse the githash.