add if_true/if_false method in FormMapper
add tree layout elements
move branch alias to 2.4
Merge branch '2.3'

Conflicts:
	Mapper/BaseGroupedMapper.php