move content rating app detail tests to right suite
shorten IARC strings in german locale (bug 980058)
Add DATABASE_POOL_ARGS to prod settings.
Merge pull request #1845 from jasonthomas/prod-db-settings

Add DATABASE_POOL_ARGS to prod settings.
Changed charset + fixes for IARC updates
Merge pull request #1846 from koehlermichael/master

Changed charset + fixes for IARC updates
match up the uuid for zippy
update bleach to 1.4, html5lib to 0.999