added "x folders and y files" to end of list
- minor design changes
Merge remote-tracking branch 'upstream/develop' into fileCount

Conflicts:
	res/layout/list_fragment.xml
	res/values/strings.xml
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
-rebase on develop
- bugfix: video is now playing in fullscreen
- beautify Timestamps
Revert "Add "select all" option to photo (or other) upload screen"
Include impelementation of Storage Access Framework when device is KITKAT or over
fix scenario 1
- use match_parent instead
Add workaround for Drive app in which a creation of a temporal copy is needed
[tx-robot] updated from transifex
Modify kitkat document provider implementation in order to cover all 'content://' cases
< 60 seconds -> "seconds ago"
Merge remote-tracking branch 'upstream/develop' into beautifyTimestamps

Conflicts:
	src/com/owncloud/android/utils/DisplayUtils.java
Merge pull request #683 from tobiasKaminsky/videoFullsize

Bugfix: video is now playing in fullscreen
Create static var for defining 'content://' String into FileDisplayActivity and delete some unnecessary comments
fix Problem with < Android 3.0
Get file mimeType and pass it for being checked on UploadFileOperation class. Take into account if file extension comes in content Uri
[tx-robot] updated from transifex