WAI 2.0
Merge branch 'postgres' into postgres-fay

Conflicts:
	Application.hs
	Foundation.hs