prettyphoto fixed and all links made consistent
Merge branch 'issue-155' into develop
Merge branch 'develop'