Merge formatting changes into master
Merge branch 'web' into master

Conflicts:
	MementoThread.pm
	mcurl.pl