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

Conflicts:
	Foundation.hs
	Model.hs
	PROJECTNAME.cabal