Completed struts_annotations
Merge branch 'dev'