Added upgrade for plone.app.querystring which adds new fields and operations
Fixed merging issues
Merge pull request #17 from ichim-david/master

Added upgrade for plone.app.querystring which adds new fields and operations