Merge pull request #155 from nZEDb/master

Updating dev.
Fix by itofzo for API/RSS https://github.com/nZEDb/nZEDb/issues/147#
Merge branch 'dev' of https://github.com/nZEDb/nZEDb into dev
Merge pull request #156 from nZEDb/dev

Fix by itofzo for API/RSS https://github.com/nZEDb/nZEDb/issues/147#