Granted creation of a new client object (with a new socket) when the network connection is lost
Fixed units in media control view
Merge branch 'develop' into release-1.4.6
Merge branch 'develop' into release-1.4.6
Avoid occasional crash in app updates due to 'lost' events from previous synchronizations
Merge remote-tracking branch 'origin/release-1.4.6' into release-1.4.6
OC-1580: Cancel upload
OC-1730: Update Images
Merge pull request #268 from owncloud/fix_fails_in_uploads_after_fall_and_rise_of_network_connection

Fix fails in uploads after fall and rise of network connection
Update serialVersionUIDs and version name/number
Delete maxSdkVersion=17 for workaround
Merge branch 'develop' into release-1.4.6