Synch with 2.5.x-develop branch
Update richfaces-archetype-simpleapp to WFK 2.5