add a flexible function and a little improvement

<td><s:property value="#GroupA.TeamLab"/></td>
remove conflict for a merge

remove conflict for a merge