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

Conflicts:
	Application.hs
	PROJECTNAME.cabal
	Settings.hs
Add missing browser ID settings
Merge branch 'postgres' into sqlite