#611 settings now converted to json blobs and only loaded on app fresh start
Merge branch 'feature-20141014-new-server' into 20140401-dev-stable
#611 qr reader integration
#611 fix wrong expiry time when generating authorized application id
Merge branch 'feature-20141014-new-server' into 20140401-dev-stable
Merge branch '20140401-dev-stable' into feature-20141016-qr-code
#611 downloading and applying now works
#611 prompt user to sign out after qr scanning
- implemented mechanism for switching video surfaces in media test application
https://github.com/openpeer/opandroid/issues/620
Merge branch 'feature-20141002-video-crop' into 20140401-dev-stable
Merge remote-tracking branch 'origin/20140401-dev-stable' into feature-20141015-curl-fixing