Merge commit '79869fd920fcc70a901044c7ee362038ea42b27a' into nemo_master_merge

Conflicts:
	libnemo-private/Makefile.am
	libnemo-private/nemo-debug.c
	libnemo-private/nemo-debug.h
	libnemo-private/nemo-file-undo-operations.c
	libnemo-private/nemo-search-directory.c
	libnemo-private/nemo-search-engine-simple.c
	libnemo-private/nemo-search-engine-simple.h
	libnemo-private/nemo-search-engine-tracker.c
	libnemo-private/nemo-search-engine-tracker.h
	libnemo-private/nemo-search-engine.c
	libnemo-private/nemo-search-engine.h
	po/ar.po
	po/el.po
	po/es.po
	po/zh_HK.po
	po/zh_TW.po
	src/nemo-view.c
	test/test-nemo-search-engine.c
added -Wno-deprecated-declarations for building with Ubuntu Saucy