Deleted some files from the template project
Resolved conflicts in kanban-project-webapp/pom.xml