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

Conflicts:
	C1208GS4G2eProject/nbproject/private/private.properties
	C1208GS4G2eProject/nbproject/private/private.xml