OC-3311: Update background color of image preview to black
Update versionName and versionCode in AndroidManifest.xml (oc and workaround))
Update auth_fail_get_user_name string
Merge branch 'develop' into release-1.5.5
Update notification icons
Updated notification icon for Android 2.x
Fixed crash after app updates due to changed serialization id in RemoteOperationResult
Fixed lost text in notifications for failed uploads
Merge pull request #447 from owncloud/fix_lost_name_in_failed_notification_due_to_changed_credentials

Fixed lost text in notifications for failed uploads
Fixed detection of authentication method in server with permanent redirection
Merge pull request #448 from owncloud/fix_detection_of_authentication_method_in_server_with_permanent_redirection

Fixed detection of authentication method in server with permanent redire...
Merge branch 'master' into develop