Resolved conflicts, added new icons
Changed background on small versions of some icons.
Merge remote-tracking branch 'upstream/master'
Merge pull request #29 from morganzhu/master

Additional icons