Merge commit '6be7b953a0e7f897c8fc163fa2f1333c5544daff' into master_merge_2

Conflicts:
	src/nemo-pathbar.c
	src/nemo-places-sidebar.c
Revert: "Don't try to update the icon as the file loads"

This brakes the xdg icons in places sidebar

Merge commit '5b495db06ae7f36c861ceebb71928f7724d7c673' into master_merge_2

Conflicts:
	libnemo-private/nemo-bookmark.c
Revert: "Use symbolic icons for the sidebar and bookmarks" but use the "follow-state"

Merge commit 'f0e28d7fa0788427d0e1ec2eebf8c300bafa33c6' into master_merge_2

Conflicts:
	libnautilus-private/nautilus-icon-names.h
	src/nemo-desktop-window.c
	src/nemo-places-sidebar.c
Merge commit 'b1c92737588e145852e126af42469425877eca2a' into master_merge_2

Conflicts:
	libnemo-private/nemo-icon-info.c
	libnemo-private/nemo-icon-info.h
	src/nemo-places-sidebar.c
Merge commit '382b59d06e86aac80cd46a9326eb342282a82561' into nemo_master_merge

Conflicts:
	src/nemo-view.c
Merge commit '888d712d78398b0038824dfafaa39a84ca36e741' into nemo_master_merge

Conflicts:
	src/nemo-window.c
Merge commit 'ac7810422554e376398bd346217b1ff1e33f0886' into nemo_master_merge

Conflicts:
	src/nemo-view.c
Merge commit 'a7feea344d68c653317d5beebc420035e2145081' into nemo_master_merge
Only works with glib >= 2.34

Conflicts:
	src/nemo-application.c
	src/nemo-application.h
	src/nemo-notebook.h
	src/nemo-places-sidebar.c