[TIDOC-1163] Update ti.cloud docs for new push notification API with device tokens
[TIMOB-13774] Fixed merge conflicts.
timob-13914: register touch events for list item
Merge branch '3_1_X' of git://github.com/appcelerator/titanium_mobile into timob-13914-3_1_X
Merge pull request #4503 from cb1kenobi/timob-13774_3_1_X

[TIMOB-13774] Added tiapp.xml setting to allow or disallow touch events...
TIMOB-13699-override registerForTouch to register touch events for listView
Merge pull request #4504 from hieupham007/timob-13914-3_1_X

Timob 13914 3 1 x
[CLOUDSRV-2549] Ti.CloudPush 2.3.2 Update
[TIMOB-14450] Ti.CloudPush 2.3.2 Update(remove 2.3.1)
Merge pull request #4506 from ins429/CLOUDSRV-2549-3_1_X

[CLOUDSRV-2549] Ti.CloudPush 2.3.2 Update
Merge pull request #4381 from bhatfield/tidoc-1163-3_1_X

[TIDOC-1163](3_1_X) Update ti.cloud docs for new push notification API with device tokens
[TIDOC-1210] Updates for new module version and GCM support

Conflicts:
	apidoc/Titanium/CloudPush/CloudPush.yml
[TIDOC-1210] Address comment
[TIDOC-1210] Reword
Merge pull request #4513 from bhatfield/tidoc-1210-3_1_X

[TIDOC-1210](3_1_X) Updates for new module version and GCM support
[TIMOB-14698]Adding -76.png and -76@2x.png icons.
timob-14719: Fix for backgroundColor
Merge pull request #4530 from hieupham007/timob-14720-3_1_X

Timob 14720 3 1 x
timob-14268: update facebook module
Merge pull request #4533 from pingwang2011/timob-14268-3_1_X

Timob 14268 3 1 x: Android: Facebook Module in 3.1.1 has same version as in 3.1.0