Finished some more of the EmailService
Merge branch 'master' of https://github.com/nbonnet13/InfiniteLoop

Conflicts:
	InfiniteLoopGoogleApp/war/AdminHome.jsp