fellows images and popovers
missed a commit in the css
fixing merge conflicts.
Merge pull request #60 from postcode/develop

Develop