- bugfix: video is now playing in fullscreen
- beautify Timestamps
[tx-robot] updated from transifex
[tx-robot] updated from transifex
fix scenario 1
[tx-robot] updated from transifex
[tx-robot] updated from transifex
- use match_parent instead
[tx-robot] updated from transifex
[tx-robot] updated from transifex
< 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
fix Problem with < Android 3.0
[tx-robot] updated from transifex
- reference bug 716
Merge pull request #685 from tobiasKaminsky/beautifyTimestamps

Relative time stamps in the list of files.
Merge branch 'develop' of github.com:owncloud/android into reliable_uploads

Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
working on UploadListActivity