Merge branch 'timob-12970' into timob-7401
Support Ti.Media.switchCamera. TIMOB-7401
timob-14540: handle OutOfMemoryError gracefully
timob-14349: Implementing setCacheMode for web view
timob-14540: handle OutOfMemoryError gracefully
timob-14317: first implementation of threshold
TIMOB-9991-added a new Android property to disable lightTouchEnabled
TIMOB-11665 Warn only if file may be HTML.
timob-14317: change event to 'marker'
TIMOB-13046 remove remote  flag check
Merge remote-tracking branch 'origin/master' into timob-7401

Conflicts:
	android/modules/media/src/java/ti/modules/titanium/media/MediaModule.java
	android/modules/media/src/java/ti/modules/titanium/media/TiCameraActivity.java
[TIDOC-1195] Update default value
Document Ti.Media.switchCamera

TIMOB-7401
Merge remote-tracking branch 'upstream/master' into timob-7401
[TIMOB-8435] Fixed scrolling of iframes on iOS
Merge pull request #4517 from BlainHamon/timob-11665

TIMOB-11665 Warn only if file may be HTML.
TIMOB-9991-Took care of the review comments in docs
[TIDOC-1129] Fix URLs
Add Android-specific note to switchCamera doc.

TIMOB-7401
Merge remote-tracking branch 'upstream/master' into timob-7401