Yesod 1.2
Combine CSS/JS yesodweb/yesod#517
Merge branch 'postgres' into simple

Conflicts:
	Application.hs
	Foundation.hs
	PROJECTNAME.cabal
	Settings.hs
	tests/HomeTest.hs
	tests/TestImport.hs
	tests/main.hs
Add missing browser ID settings
Merge branch 'postgres' into simple

Conflicts:
	Foundation.hs
Add hspec to deps