update struts
Merge branch 'master' of github.com:VuogNguyen/MongoDB-SA

Conflicts:
	.idea/workspace.xml