Completed if/else in struts_control_tags
Polishing
Merge branch 'dev'