Issue #28 folders don't show date and size info
OC-167
Update branch with develop branch
Merge remote-tracking branch 'origin/develop' into folderSizeInfo

Conflicts:
	.classpath
	tests/.classpath
Merge pull request #140 from owncloud/folderSizeInfo

Issue #28 folders don't show date and size info