Automated Email Sending
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/Dashboard.jsp
Added excel file creation
Merge branch 'master' of https://github.com/IDeaSCo/COS

Conflicts:
	src/main/webapp/Dashboard.jsp