Merge branch 'gh-pages' of https://github.com/Zuzle/rebenoq into gh-pages

Conflicts:
	assets_source/templates/category/category-sidebar.jade
	category.html
Category