Merge pull request #37 from levelup/lu_dev

Fixes an issue when PhotoView is in a ViewPager
[library] Bit of tidy up to aea36b9aa734d5c7d3fb69f43926dbac28453048