support proxy in curl
Merge branch 'master' of github.com:rhomobile/rhodes into curlproxy
fix stupid typo
Enhancing Geolocation feature. Added support for Speed, Altitude & Satellites
Enhancing Geolocation feature. Added support for Speed, Altitude & Satellites
support System.httpProxyURI for iOS and Android
Merge branch 'master' of github.com:rhomobile/rhodes into curlproxy
Support only BASIC auth
Merge branch 'master' into curlproxy

Conflicts:
	lib/commonAPI/coreapi/ext/system.xml
application: remove Screen lock/unlock events and update documentation about event firing
application: clarify iOS SCREEN_OFF behavior.
Merge pull request #221 from rhomobile/remove-screen-lock-events

Remove screen lock events
CommonAPI: Ruby: fix real screen width Ruby property name
iOS: fix crash on iOS 5.0 devices
Merge pull request #218 from rhomobile/RE_4.1_Geolocation_WM

Re 4.1 geolocation wm
Merge pull request #219 from rhomobile/curlproxy

Curlproxy
Merge remote-tracking branch 'origin/master' into android_sendApplicationMessage

Conflicts:
	lib/commonAPI/coreapi/ext/shared/SystemImplBase.cpp
	lib/commonAPI/coreapi/ext/shared/SystemImplBase.h