Add a more explicit dependency between carousel and toolbar
Merge branch 'master' of github.com:rayburgemeestre/PhotoSwipe into autotrack