multiple modes supported
Merge branch 'master' of https://github.com/skovsboll/pustefix

Conflicts:
	app.rb