Merge branch 'master' into android_build

Conflicts:
	android/package.json
	iphone/package.json
	support/node_modules/titanium-sdk/lib/android.js
Merge branch 'android_build' into timob-14974