Merge pull request #92 from kaernyk/master

Improve image scaling in catalog
Improve image handling in catalog to improve consistency

Conflicts:
	stylesheets/style.css
Remove erroneous data and fix indentation

Conflicts:
	stylesheets/style.css
Merge https://github.com/vichan-devel/vichan
fix catalog margins
Merge https://github.com/vichan-devel/vichan

Conflicts:
	stylesheets/style.css