Resolve conflicts
Resolve conflicts
Resolve conflicts
Update validation DOCTYPE declaration
Update gitignore. Add nb-configuration.xml
Remove cache references
Upgrade Struts2 version (2.3.15.1)
Resolve conflicts
bump version to 3.3.1-SNAPSHOT