Merge pull request #1 from EJanuszewski/dev

Dev
Added Comment View
Replaced comment icon
Merge pull request #2 from EJanuszewski/master

Merge back to dev