Clips, videos and comments
Adding icon
adding comment template
Merge branch 'master' of github.com:matthewbaggett/VideoPile

Conflicts:
	sites/all/modules/videopile/templates/view.phtml