Windows Overlay Icons
Support for multiple icons
Windows Shell extension: Add watched directories
Merge remote-tracking branch 'origin/win_overlay_icons'

Conflicts:
	.gitignore