Gallery, Pagination
new tags and a new slideshow
Merge branch 'master' into gallery-and-pagination

Conflicts:
	src/styles/style.css.styl
Merge branch 'gallery-and-pagination'

Conflicts:
	src/styles/style.css.styl