Upgrade to the latest version of psycopg2
Merge branch 'develop' into patch-1

Conflicts:
	requirements/project.txt
Merge pull request #308 from alex/patch-1

Upgrade to the latest version of psycopg2