2 gallery types
Merge branch 'develop' into gh-pages

* develop:
  2 gallery types