Added help link, feedback email, recommendations through email, and (disabled) imprint link to app settings
REALLY added imprint link in settings; imprint and help links protected for bad configuration of preferences.xml
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-1670: owncloud_white --> background_color
OC-1671: ActionBar Color
OC-1646: Adding multiaccount_support property
0C-1647: Enable/Disable Create Account option
OC-1668: Block creation of account from device settings
OC-1730: Update Images
Merge branch 'develop' into contact_settings

Conflicts:
	res/values/strings.xml
OC-1656: Disable/enable help-imprint-feedback options
OC-1662: app_name to setup.xml
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
OC-1663: Replace references to app_name in code