Fixed Send email
Merge branch 'develop' of https://github.com/tncgroup/stsrepo into develop

Conflicts:
	TNC/src/main/java/com/tnc/controller/SendEmailController.java