Autotrack

Merge changes from master branch into autotrack branch.

And commit 4380351 to fix hi res css style (photoswipe.css includes icons-2x.png for hi-res)