Merge remote-tracking branch 'origin/20140401-dev-stable'

Conflicts:
	OpenPeerNativeSampleApp/jni/CacheDelegateWrapper.cpp
	OpenPeerNativeSampleApp/jni/EventManager.cpp
	OpenPeerNativeSampleApp/jni/EventManager.h
	OpenPeerNativeSampleApp/jni/OpenPeerNativeSampleApp.cpp
	OpenPeerNativeSampleApp/jni/com_openpeer_javaapi_OPCache.cpp
	OpenPeerNativeSampleApp/jni/com_openpeer_javaapi_OPCall.cpp
	OpenPeerNativeSampleApp/jni/com_openpeer_javaapi_OPContact.cpp
	OpenPeerNativeSampleApp/jni/com_openpeer_javaapi_OPConversationThread.cpp
	OpenPeerNativeSampleApp/jni/com_openpeer_javaapi_OPIdentityLookup.cpp
	OpenPeerNativeSampleApp/jni/com_openpeer_javaapi_OPStack.cpp
	OpenPeerNativeSampleApp/src/com/openpeer/delegates/CallbackHandler.java
	README.md
	openpeer-android-sdk/jni/CacheDelegateWrapper.cpp
	openpeer-android-sdk/jni/EventManager.cpp
	openpeer-android-sdk/jni/EventManager.h
	openpeer-android-sdk/jni/com_openpeer_javaapi_OPCache.cpp
	openpeer-android-sdk/jni/com_openpeer_javaapi_OPCall.cpp
	openpeer-android-sdk/jni/com_openpeer_javaapi_OPContact.cpp
	openpeer-android-sdk/jni/com_openpeer_javaapi_OPConversationThread.cpp
	openpeer-android-sdk/jni/com_openpeer_javaapi_OPIdentityLookup.cpp
	openpeer-android-sdk/jni/com_openpeer_javaapi_OPMediaEngine.cpp
	openpeer-android-sdk/jni/com_openpeer_javaapi_OPStack.cpp
	openpeer-android-sdk/src/com/openpeer/delegates/CallbackHandler.java
	openpeer-android-sdk/src/com/openpeer/javaapi/OPAccount.java
	openpeer-android-sdk/src/com/openpeer/javaapi/test/OPTestMediaEngine.java