removing line that was causing an icon folder to be ignored
Merge remote-tracking branch 'origin/dev' into dev