Merge commit 'refs/pr/392' into improve_action_bar_pr_392_with_develop
Update string: 'New folder' instead of 'Create directory'
Replace 'directory' by 'folder' in strings.xml
Merge branch 'develop' into improve_action_bar_pr_392_with_develop
Add different action bar configuration for landscape and portrait
Revert "Add different action bar configuration for landscape and portrait"

This reverts commit 6dde4ddd3a1dd5f8e239f5056d863274ae2196da.
Add different action bar configuration for landscape and portrait
On any device, any orientation, show the icons for Upload and New folder directly in the bar.
Merge branch 'develop' into improve_action_bar_pr_392_with_develop
Merge pull request #453 from owncloud/improve_action_bar_pr_392_with_develop

Improved visibility of icons in action bar