persistent 1.3
Merge branch 'postgres' into simple

Conflicts:
	PROJECTNAME.cabal