Add current theme directory to icon theme path
Allow themes to set menu icon by default
Merge branch 'menu-icon' of https://github.com/collinss/Cinnamon into collinss-menu-icon

Conflicts:
	files/usr/share/cinnamon/applets/menu@cinnamon.org/settings-schema.json
Merge branch 'master' of github.com:linuxmint/Cinnamon