Merge branch 'android_intent' of github.com:rhomobile/rhodes into iphone_intent

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
iphone: intents initial
Merge branch 'master' of github.com:rhomobile/rhodes into iphone_intent
Merge branch 'master' of github.com:rhomobile/rhodes into iphone_intent
Merge branch 'master' of github.com:rhomobile/rhodes into iphone_intent
open intent uri if appName is empty
rhosimulator/osx: build fix
Merge branch 'master' of github.com:rhomobile/rhodes into iphone_intent
fix open urls
Merge branch 'iphone_intent' of github.com:rhomobile/rhodes into iphone_intent
fix passing null arguments
Merge branch 'intent_merge' into iphone_intent

Conflicts:
	lib/commonAPI/coreapi/ext/shared/InitExtension.cpp