criterias pgsql
added criterias
Merge branch 'develop'