Complete the separation of the Mailout from the Base code
Merge branch 'master' into unimelb

Conflicts:
	src/mailouts/Main.java
	src/mailouts/resources/header.html