[TIMOB-15711] Fixed sync issues with xcodebuild and optimize images running at the same time.
Merge pull request #4972 from cb1kenobi/timob-15703

[TIMOB-15703] [TIMOB-15713] iOS build fixes
[TIMOB-15720] Allow native Android modules to not require a main jar file.
Merge pull request #4977 from cb1kenobi/timob-15722

[TIMOB-15722] Fixed bug where Genymotion emulators were showing up as connected devices.
Merge branch 'master' into timob-15711

Conflicts:
	iphone/cli/commands/_build.js
Merge pull request #4979 from cb1kenobi/timob-15720

[TIMOB-15720] Allow native Android modules to not require a main jar file.
Merge pull request #4973 from cb1kenobi/timob-14620

[TIMOB-14620] Updated the tiapp.xml template to use the <ios> section in...
re syncing with master
re syncing with master
re syncing with master
[TIMOB-6423] Fixed up keystore key password checking and prompting.
Merge pull request #4975 from pingwang2011/timob-15484

timob-15484: Android: Make property ti.android.bug2373.finishfalseroot default to true (in order to fix "restart required" bug by default)
Merge pull request #4955 from bhatfield/tidoc-1328

Approved and merged.
[MOD-1492] Adding iOS Map Module 2.0.0 to packaged modules
Merge pull request #4978 from cb1kenobi/timob-15711

[TIMOB-15711] Fixed sync issues with xcodebuild and optimize images runn...
Merge pull request #4980 from cb1kenobi/timob-6423

[TIMOB-6423] Fixed up keystore key password checking and prompting.
Merge pull request #4650 from jonalter/MOD-1514

[MOD-1514] Map iOS: moving to a standalone module
Merge pull request #4981 from jonalter/MOD-1492

[MOD-1492] Adding iOS Map Module 2.0.0 to packaged modules
Merge pull request #4971 from bhatfield/mod-1523

[MOD-1523] Add deprecated notes
TIMOB-15725: Fix error where we check for krollApplication before runtime is initialized.