Merge pull request #220 from sharoonthomas/develop

Add template_filter decorator
Release version 3.2.0.4
Merge branch 'release/3.2.0.4' into develop
Update SQL Pagination to use python-sql

* Implemented distinct
Merge branch 'sql-pagination' into develop
Release version 3.2.0.5
Merge branch 'release/3.2.0.5' into develop
Fixed DISTINCT and ORDER_BY combination for postgresql
Merge pull request #223 from tarunbhardwaj/pagination

Fixed DISTINCT and ORDER_BY combination for postgresql
Create email contact mechanism for new nereid users #5731
Merge pull request #224 from aroraumang/feature/task-5731

Create email contact mechanism for new nereid users #5731
If record doesn't exist corresponding to active_id. abort(404) #4780

If record doesn't exist corresponding to active_id, then logically url
is invalid and hence url should be aborted(404) at dispatcher level
only.

Github Issue: #204

Conflicts:
	trytond_nereid/tests/test_routing.py
Merge pull request #225 from PritishC/develop

If record doesn't exist corresponding to active_id. abort(404) #4780
Release version 3.2.0.6
Merge branch 'release/3.2.0.6' into develop
Readonly transaction for GET requests #6122
Merge pull request #227 from prakashpp/get-rq-readonly

Readonly transaction for GET requests #6122
When nereid_website timezone is None use Default timezone instead
Merge pull request #229 from tarunbhardwaj/develop

When nereid_website timezone is None use Default timezone instead
Handle XHR on reset password #6141