update an .m4 file
Fix scaling of text-x-preview (the icon used for text files in Mint-X that shows
a preview of the first few lines of text in it.)

Yay!
Temporarily disable a thumbnail limiting
sidebar: Add Recent place.

Need to make a better icon for recent
Couple fixes to recent, default to accessed time order
Fix some of the context menu abilities with regards to the recent view.
properly center a couple of the new toolbar icons
change icon for recent places
Merge pull request #571 from JosephMcc/icon-fixes

Icon fixes
Merge commit 'cccc4407cb9cdad8b2fbd2607d7f2c31e70c052f' into nemo_master_merge_nemo_base_maya
Revert: "Fix scaling of text-x-preview"

This does not build with Maya

Merge commit 'c6097a60bdded697f0101fa7f64a57b8e38ab557' into nemo_master_merge_nemo_base_maya
Merge commit '6359bb8cd630be0090b033ff6110e06a5f9f1380' into nemo_master_merge_nemo_base_maya
Merge commit '55085e174a951221aa4a286745acaa70c33f0611' into nemo_master_merge_nemo_base_maya

Conflicts:
	libnemo-private/nemo-directory.c
	libnemo-private/nemo-directory.h
	libnemo-private/nemo-file-operations.c
	libnemo-private/nemo-file.c
	libnemo-private/nemo-recent.c
	src/nemo-places-sidebar.c
	src/nemo-properties-window.c
	src/nemo-view.c
Fix build break due to an api change/fix in python-polib.
Merge commit '270523a8f4ecadb364ed87986ddaa03a2dc8753d' into nemo_master_merge_nemo_base_maya

Conflicts:
	libnemo-private/nemo-file.c
	src/nemo-properties-window.c
	src/nemo-view.c