Merge branch 'pr/311' into pull_request_311_with_develop

diff --cc res/menu/file_actions_menu.xml
Simple merge

diff --cc res/values-de-rCH/strings.xml
Simple merge

diff --cc res/values-de-rDE/strings.xml
Simple merge

diff --cc res/values-de/strings.xml
Simple merge

diff --cc res/values-en-rGB/strings.xml
Simple merge

diff --cc res/values/strings.xml
Simple merge

diff --cc src/com/owncloud/android/ui/fragment/OCFileListFragment.java
Simple merge

diff --cc src/com/owncloud/android/ui/preview/PreviewImageFragment.java
Simple merge