Fix typo
Fix another typo
Made rss.py work with new database
Merge pull request #96 from thecookiefactory/dev

fixed category filter query
Merge pull request #99 from thecookiefactory/dev

added support for not live custom pages, New colors for articles, prevented returning "one days"
Merge pull request #100 from thecookiefactory/dev

Make github.py not set new editdate on every check
Merge pull request #101 from thecookiefactory/dev

Fix article searching
Merge pull request #104 from thecookiefactory/dev

minor fixes
Add missing dependency to README
Add missing dependency to srv/README
Revert "Revert "(re)added ad containers""

This reverts commit cdbbc7a548b8d4e16a25493e7432f99c9143fbdd.
Add ads to news page
Add feature to create new custom pages
Add ad unit to maps page
Merge pull request #110 from thecookiefactory/dev

URL rewriterules and other minor fixes