Workaround for yesodweb/yesod#814
persistent 2.0
Merge branch 'postgres' into sqlite

Conflicts:
	PROJECTNAME.cabal