WAI 2.0
Merge branch 'postgres' into mongo

Conflicts:
	Application.hs