modify to use EL; complete account editing
bug fix
bug fix on EL
handle conflict, add RHouse
add afterInitialization method
update RHouse and RSeat
handle merge conflict