convert None to colander.null in get_appstruct, refs #268
update changelog with info regarding #268 fix
Merge pull request #269 from jcerjak/master

Fix for #268
Update catalogs
Update Portuguese translations
Add a label next to each item in @@navigate to show what the content type is
Merge pull request #271 from neilferreira/nav-tree

Add a label next to each item in @@navigate to show what the content type is
Force pytest>=2.4.2 test requirements.

This may fix the Travis error, e.g. at
https://travis-ci.org/Kotti/Kotti/jobs/12413771
Merge branch 'master' of github.com:Kotti/Kotti
Merge pull request #270 from teixas/0.9.2-translation

0.9.2 translation
Turn off email notification: too verbose for list.
Use add_default_renderers method on the configurator
Chameleon bindings were removed from Pyramid core
Module ``pyramid.fixers`` no longer exists
Pin Pyramid to 1.5a2
Merge pull request #273 from teixas/pyramid-1.5a2-compatible

Pyramid 1.5a2 compatible
Master is now 0.10
Merge branch 'master' of github.com:Kotti/Kotti
Upgrade pyramid_debugtoolbar.  Required for Pyramid 1.5.