Send Email from webPage
remove conflict
Merge branch 'master' of https://github.com/jerome-tan-git/led.git

Conflicts:
	ledweb/.gitignore
	ledweb/WebContent/WEB-INF/contactUsWeb.ftl
	ledweb/WebContent/WEB-INF/filemanagement.ftl
	ledweb/src/ledweb/action/FileManagement.java
	ledweb/src/ledweb/action/Home.java