Merge pull request #204 from robotmay/master

Bugfixes for image processing issues
Sort categories in nav by localised name
Merge pull request #207 from robotmay/master

Security and performance updates
Merge pull request #208 from robotmay/category-order

Sort the categories in the nav by their localised names
Merge remote-tracking branch 'upstream/master'