output formatting again
Merge remote-tracking branch 'origin/master'

Conflicts:
	Soa2/Soa2/App.config