Add archetype for Struts2 with AngularJS
Change web-app id and web displayName
Merge remote-tracking branch 'upstream/trunk' into trunk
added license headers to convention archetype
Merge commit '13c61710bbe1b4f773038a1f85891b3a111d8253' into licenseheaders

Conflicts:
	archetypes/struts2-archetype-angularjs/README.txt
	archetypes/struts2-archetype-angularjs/src/main/resources/META-INF/maven/archetype-metadata.xml
	archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/LICENSE.txt
	archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/NOTICE.txt
	archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml
	archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/HelloAction.java
	archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/package.properties
	archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/package_es.properties
	archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/struts.xml
	archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp
	archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
Merge pull request #1 from opensourceio/licenseheaders

Licenseheaders