DAO + JSP
Merge branch 'master' of https://github.com/Viewtiful/Mailer.git

Conflicts:
	WebContent/index.jsp
Index.jsp
Merge branch 'master' of https://github.com/Viewtiful/Mailer.git

Conflicts:
	WebContent/index.jsp