- fix in log message
- fixed potential violations of document locking from cacheable document
Merge remote-tracking branch 'origin/feature-20140804-fix-android-scripts' into feature-20140804-settings-fix
- changing video surfaces while call is active
https://github.com/openpeer/opandroid/issues/483
strip "-" from messageId generated
#499 fix pull refresh gesture
- updated to op submodule changes
 #498  make sure all contacts show in contacts tab
Merge branch 'feature-20140804-settings-fix' into 20140401-dev-stable
Merge branch '20140401-dev-stable' into feature-20140729-push-urbanairship
add dummy airship configuration
Merge branch '20140401-dev-stable' into feature-20140730-merge-jni

Conflicts:
	OpenPeerSampleApp/src/com/openpeer/sample/conversation/CallFragment.java
Merge branch '20140401-dev-stable' into feature-20140730-merge-jni
video reattachment now working well