* set the merging request flag before testing the merge results to allow staticly placed tiles in content templates to be rendered properly.

refs #172
pinning plone.tiles to correct version
 * a better, and more complete solution to the panels/tiles problem
fixed what is already fixed, missed during merge
adding missing changelog entry for pull request
Merge pull request #10 from sixfeetup/deco-lite-fixes

added z3c.autoinclude support to reduce noise in buildout confs