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
Merge remote-tracking branch 'upstream/develop' into fileCount
fix bug #742
changed order to: file(s), folder(s)
Merge pull request #662 from tobiasKaminsky/fileCount

File count