Eric: new icons
Eric: new icons
Eric: new icons
Eric: file folder icon
Eric: file folder icon
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/misc.xml
Eric: file folder icon