added picture icons
Merge pull request #151 from jivedesign/master

added picture icons
Merge pull request #152 from CMPUT301F14T03/master

merging some changes into dev