New project
Merge branch 'master' of https://github.com/audoban/dolphin-folder-color

Conflicts:
	LICENSE