add model/services/controllers for template data management. add wcf services, add word add on project
resolve conflicts