Support for monad-logger 0.3
monad-logger support for tests
Merge branch 'postgres' into simple

Conflicts:
	Application.hs
	Foundation.hs
	PROJECTNAME.cabal
	tests/TestImport.hs
Provide getLogger
Merge branch 'postgres' into simple

Conflicts:
	Foundation.hs
http-conduit 1.9
Merge branch 'postgres' into simple
Derive Typeable for User (upcoming Yesod 1.2 change)
Merge branch 'postgres' into simple

Conflicts:
	Model.hs
	config/models
Yesod 1.2
Combine CSS/JS yesodweb/yesod#517
combineStylesheets documentation
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
Merge remote-tracking branch 'origin/postgres-1.2' into postgres
Merge branch 'postgres' into simple
Update .ghci

from yesodweb/yesod/#552
Cleaner runDB