hi
Merge branch 'master' of github.com:zeraf29/oggle

Conflicts:
	target/classes/com/mju/oggle/controller/EmailSender.class