SY Merging struts.xml
Merge branch 'master' of https://github.com/NCIP/rembrandt
Code cleanup