Fixed prettyPhoto completely
Merge branch 'issue-156' into develop