add templateDTO
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/softensity/controller/TemplateController.java
	src/main/java/com/softensity/service/TemplateService.java
add templateDTO